diff options
| author |   Matsuu Takuto <matsuu@gentoo.org> | 2009-07-14 15:27:59 +0000 |
|---|---|---|
| committer | Matsuu Takuto <matsuu@gentoo.org> | 2009-07-14 15:27:59 +0000 |
| commit | 76dc5416ababd60bd36be3bf42f0a0d9a78c6ee9 (patch) | |
| tree | 0be820cad11365c726f88cb14a10c76a962265d4 /net-wireless/broadcom-sta/files | |
| parent | Version bump, thank Vadim Efimov for report. Added a note about patch depende... (diff) | |
| download | gentoo-2-76dc5416ababd60bd36be3bf42f0a0d9a78c6ee9.tar.gz gentoo-2-76dc5416ababd60bd36be3bf42f0a0d9a78c6ee9.tar.bz2 gentoo-2-76dc5416ababd60bd36be3bf42f0a0d9a78c6ee9.zip | |
Added COMPAT_NET_DEV_OPS to CONFIG_CHECK, bug #276057. Added patch for 2.6.31, bug #277552.
(Portage version: 2.1.6.13/cvs/Linux x86_64)
Diffstat (limited to 'net-wireless/broadcom-sta/files')
| -rw-r--r-- | net-wireless/broadcom-sta/files/broadcom-sta-5.10.91.9-linux-2.6.31.patch | 50 |
1 files changed, 50 insertions, 0 deletions
diff --git a/net-wireless/broadcom-sta/files/broadcom-sta-5.10.91.9-linux-2.6.31.patch b/net-wireless/broadcom-sta/files/broadcom-sta-5.10.91.9-linux-2.6.31.patch new file mode 100644 index 000000000000..ac31fbde3ec3 --- /dev/null +++ b/net-wireless/broadcom-sta/files/broadcom-sta-5.10.91.9-linux-2.6.31.patch @@ -0,0 +1,50 @@ +--- src/wl/sys/wl_linux.c.orig.1 2009-07-12 13:28:30.000000000 -0700 ++++ src/wl/sys/wl_linux.c 2009-07-12 15:46:52.000000000 -0700 +@@ -222,9 +222,23 @@ + }; + #endif + ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 31) ++static const struct net_device_ops wl_net_device_ops = ++{ ++ .ndo_open = wl_open, ++ .ndo_stop = wl_close, ++ .ndo_start_xmit = wl_start, ++ .ndo_get_stats = wl_get_stats, ++ .ndo_set_mac_address = wl_set_mac_address, ++ .ndo_set_multicast_list = wl_set_multicast_list, ++ .ndo_do_ioctl = wl_ioctl, ++}; ++#endif ++ + static + void wl_if_setup(struct net_device *dev) + { ++#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 31) + dev->open = wl_open; + dev->stop = wl_close; + dev->hard_start_xmit = wl_start; +@@ -232,6 +246,9 @@ + dev->set_mac_address = wl_set_mac_address; + dev->set_multicast_list = wl_set_multicast_list; + dev->do_ioctl = wl_ioctl; ++#else ++ dev->netdev_ops = &wl_net_device_ops; ++#endif + #ifdef CONFIG_WIRELESS_EXT + #if WIRELESS_EXT < 19 + dev->get_wireless_stats = wl_get_wireless_stats; +--- src/wl/sys/wl_iw.c.orig.1 2009-07-12 13:40:51.000000000 -0700 ++++ src/wl/sys/wl_iw.c 2009-07-12 15:46:39.000000000 -0700 +@@ -124,7 +124,11 @@ + + fs = get_fs(); + set_fs(get_ds()); ++#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 31) + ret = dev->do_ioctl(dev, &ifr, SIOCDEVPRIVATE); ++#else ++ ret = dev->netdev_ops->ndo_do_ioctl(dev, &ifr, SIOCDEVPRIVATE); ++#endif + set_fs(fs); + + return ret; |