/[gentoo-x86]/net-wireless/broadcom-sta/files/broadcom-sta-5.60.48.36-linux-2.6.35.patch
Gentoo

Contents of /net-wireless/broadcom-sta/files/broadcom-sta-5.60.48.36-linux-2.6.35.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 1.2 - (show annotations) (download)
Wed Oct 26 23:32:28 2011 UTC (2 years, 11 months ago) by matsuu
Branch: MAIN
CVS Tags: HEAD
Changes since 1.1: +0 -0 lines
FILE REMOVED
Version bumped, bug #388547.

(Portage version: 2.1.10.29/cvs/Linux x86_64)

1 diff -Naur broadcom-sta-5.60.48.36.orig/src/wl/sys/wl_iw.h broadcom-sta-5.60.48.36/src/wl/sys/wl_iw.h
2 --- broadcom-sta-5.60.48.36.orig/src/wl/sys/wl_iw.h 2010-02-06 10:59:15.000000000 +0900
3 +++ broadcom-sta-5.60.48.36/src/wl/sys/wl_iw.h 2010-06-05 09:32:46.000000000 +0900
4 @@ -15,6 +15,7 @@
5 #ifndef _wl_iw_h_
6 #define _wl_iw_h_
7
8 +#include <linux/semaphore.h>
9 #include <linux/wireless.h>
10
11 #include <typedefs.h>
12 diff -Naur broadcom-sta-5.60.48.36.orig/src/wl/sys/wl_linux.c broadcom-sta-5.60.48.36/src/wl/sys/wl_linux.c
13 --- broadcom-sta-5.60.48.36.orig/src/wl/sys/wl_linux.c 2010-02-06 10:59:15.000000000 +0900
14 +++ broadcom-sta-5.60.48.36/src/wl/sys/wl_linux.c 2010-06-04 08:25:22.000000000 +0900
15 @@ -1416,8 +1416,13 @@
16 _wl_set_multicast_list(struct net_device *dev)
17 {
18 wl_info_t *wl;
19 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 35)
20 + struct netdev_hw_addr *ha;
21 + int i=0;
22 +#else
23 struct dev_mc_list *mclist;
24 int i;
25 +#endif
26
27 if (!dev)
28 return;
29 @@ -1430,14 +1435,22 @@
30 if (wl->pub->up) {
31 wl->pub->allmulti = (dev->flags & IFF_ALLMULTI)? TRUE: FALSE;
32
33 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 35)
34 + netdev_for_each_mc_addr(ha, dev) {
35 +#else
36 for (i = 0, mclist = dev->mc_list; mclist && (i < dev->mc_count);
37 i++, mclist = mclist->next) {
38 +#endif
39 if (i >= MAXMULTILIST) {
40 wl->pub->allmulti = TRUE;
41 i = 0;
42 break;
43 }
44 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 35)
45 + wl->pub->multicast[i] = *((struct ether_addr*) ha->addr);
46 +#else
47 wl->pub->multicast[i] = *((struct ether_addr*) mclist->dmi_addr);
48 +#endif
49 }
50 wl->pub->nmulticast = i;
51 wlc_set(wl->wlc, WLC_SET_PROMISC, (dev->flags & IFF_PROMISC));

  ViewVC Help
Powered by ViewVC 1.1.20