madwifi-cvs Mailing List for MADWIFI
Status: Beta
Brought to you by:
otaku
You can subscribe to this list here.
2003 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(4) |
---|---|---|---|---|---|---|---|---|---|---|---|---|
2004 |
Jan
(35) |
Feb
(46) |
Mar
(38) |
Apr
(3) |
May
(41) |
Jun
(102) |
Jul
(32) |
Aug
(84) |
Sep
(69) |
Oct
(32) |
Nov
(3) |
Dec
(11) |
2005 |
Jan
(14) |
Feb
(113) |
Mar
(73) |
Apr
(74) |
May
(28) |
Jun
(51) |
Jul
(55) |
Aug
(5) |
Sep
(2) |
Oct
(78) |
Nov
(97) |
Dec
(24) |
2006 |
Jan
(48) |
Feb
(36) |
Mar
(31) |
Apr
(48) |
May
(78) |
Jun
(46) |
Jul
(46) |
Aug
(9) |
Sep
(41) |
Oct
(44) |
Nov
(33) |
Dec
(39) |
2007 |
Jan
(185) |
Feb
(109) |
Mar
(84) |
Apr
(53) |
May
(109) |
Jun
(112) |
Jul
(99) |
Aug
(71) |
Sep
(14) |
Oct
(102) |
Nov
(178) |
Dec
(109) |
2008 |
Jan
(216) |
Feb
(47) |
Mar
(49) |
Apr
(178) |
May
(95) |
Jun
(60) |
Jul
(91) |
Aug
(17) |
Sep
(15) |
Oct
(2) |
Nov
(7) |
Dec
(24) |
2009 |
Jan
(39) |
Feb
(12) |
Mar
|
Apr
(63) |
May
(17) |
Jun
(36) |
Jul
(14) |
Aug
(11) |
Sep
(9) |
Oct
|
Nov
|
Dec
|
2010 |
Jan
(19) |
Feb
|
Mar
(9) |
Apr
(1) |
May
|
Jun
(4) |
Jul
(1) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
2011 |
Jan
|
Feb
(3) |
Mar
|
Apr
|
May
(6) |
Jun
(5) |
Jul
(2) |
Aug
(18) |
Sep
|
Oct
(7) |
Nov
(2) |
Dec
|
2012 |
Jan
(2) |
Feb
|
Mar
|
Apr
|
May
(2) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
2013 |
Jan
|
Feb
|
Mar
(2) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
From: Pavel R. <svn...@ma...> - 2013-03-06 16:19:33
|
Project : madwifi Revision : 4181 Author : proski (Pavel Roskin) Date : 2013-03-06 16:52:20 +0100 (Wed, 06 Mar 2013) Log Message : Remove __devinitdata, it's obsolete now Affected Files: * madwifi/trunk/ath/if_ath_pci.c updated Modified: madwifi/trunk/ath/if_ath_pci.c =================================================================== --- madwifi/trunk/ath/if_ath_pci.c 2012-05-01 19:55:40 UTC (rev 4180) +++ madwifi/trunk/ath/if_ath_pci.c 2013-03-06 15:52:20 UTC (rev 4181) @@ -94,7 +94,7 @@ * "new way" to do things, we may want to switch back to having * the HAL check them by defining a probe method. */ -static struct pci_device_id ath_pci_id_table[] __devinitdata = { +static struct pci_device_id ath_pci_id_table[] = { { 0x168c, 0x0007, PCI_ANY_ID, PCI_ANY_ID }, { 0x168c, 0x0012, PCI_ANY_ID, PCI_ANY_ID }, { 0x168c, 0x0013, PCI_ANY_ID, PCI_ANY_ID }, |
From: Pavel R. <svn...@ma...> - 2013-03-06 16:19:33
|
Project : madwifi Revision : 4182 Author : proski (Pavel Roskin) Date : 2013-03-06 16:53:15 +0100 (Wed, 06 Mar 2013) Log Message : Remove __devinitdata, it's obsolete now Affected Files: * madwifi/branches/madwifi-0.9.4/ath/if_ath_pci.c updated * madwifi/branches/madwifi-dfs/ath/if_ath_pci.c updated Modified: madwifi/branches/madwifi-0.9.4/ath/if_ath_pci.c =================================================================== --- madwifi/branches/madwifi-0.9.4/ath/if_ath_pci.c 2013-03-06 15:52:20 UTC (rev 4181) +++ madwifi/branches/madwifi-0.9.4/ath/if_ath_pci.c 2013-03-06 15:53:15 UTC (rev 4182) @@ -94,7 +94,7 @@ * "new way" to do things, we may want to switch back to having * the HAL check them by defining a probe method. */ -static struct pci_device_id ath_pci_id_table[] __devinitdata = { +static struct pci_device_id ath_pci_id_table[] = { { 0x168c, 0x0007, PCI_ANY_ID, PCI_ANY_ID }, { 0x168c, 0x0012, PCI_ANY_ID, PCI_ANY_ID }, { 0x168c, 0x0013, PCI_ANY_ID, PCI_ANY_ID }, Modified: madwifi/branches/madwifi-dfs/ath/if_ath_pci.c =================================================================== --- madwifi/branches/madwifi-dfs/ath/if_ath_pci.c 2013-03-06 15:52:20 UTC (rev 4181) +++ madwifi/branches/madwifi-dfs/ath/if_ath_pci.c 2013-03-06 15:53:15 UTC (rev 4182) @@ -94,7 +94,7 @@ * "new way" to do things, we may want to switch back to having * the HAL check them by defining a probe method. */ -static struct pci_device_id ath_pci_id_table[] __devinitdata = { +static struct pci_device_id ath_pci_id_table[] = { { 0x168c, 0x0007, PCI_ANY_ID, PCI_ANY_ID }, { 0x168c, 0x0012, PCI_ANY_ID, PCI_ANY_ID }, { 0x168c, 0x0013, PCI_ANY_ID, PCI_ANY_ID }, |
From: Pavel R. <svn...@ma...> - 2012-05-01 20:28:28
|
Project : madwifi Revision : 4180 Author : proski (Pavel Roskin) Date : 2012-05-01 21:55:40 +0200 (Tue, 01 May 2012) Log Message : Use "%s" in err() calls to fix a warning on Ubuntu 10.04 err() would be confused if the interface name has formatting characters. Affected Files: * madwifi/branches/madwifi-0.9.4/tools/80211stats.c updated * madwifi/branches/madwifi-0.9.4/tools/athstats.c updated * madwifi/branches/madwifi-dfs/tools/80211stats.c updated * madwifi/branches/madwifi-dfs/tools/athstats.c updated Modified: madwifi/branches/madwifi-0.9.4/tools/80211stats.c =================================================================== --- madwifi/branches/madwifi-0.9.4/tools/80211stats.c 2012-05-01 19:52:26 UTC (rev 4179) +++ madwifi/branches/madwifi-0.9.4/tools/80211stats.c 2012-05-01 19:55:40 UTC (rev 4180) @@ -287,7 +287,7 @@ /* no args, just show global stats */ ifr.ifr_data = (caddr_t) &stats; if (ioctl(s, SIOCG80211STATS, &ifr) < 0) - err(1, ifr.ifr_name); + err(1, "%s", ifr.ifr_name); printstats(stdout, &stats); return 0; } Modified: madwifi/branches/madwifi-0.9.4/tools/athstats.c =================================================================== --- madwifi/branches/madwifi-0.9.4/tools/athstats.c 2012-05-01 19:52:26 UTC (rev 4179) +++ madwifi/branches/madwifi-0.9.4/tools/athstats.c 2012-05-01 19:55:40 UTC (rev 4180) @@ -282,9 +282,9 @@ if (line != 0) { ifr.ifr_data = (caddr_t) &cur; if (ioctl(s, SIOCGATHSTATS, &ifr) < 0) - err(1, ifr.ifr_name); + err(1, "%s", ifr.ifr_name); if (!getifstats(ifr.ifr_name, &icur, &ocur)) - err(1, ifr.ifr_name); + err(1, "%s", ifr.ifr_name); printf("%8lu %8lu %7u %7u %7u %6u %6u %6u %7u %4u %3uM\n", (icur - itot) - (cur.ast_rx_mgt - total.ast_rx_mgt), @@ -304,9 +304,9 @@ } else { ifr.ifr_data = (caddr_t) &total; if (ioctl(s, SIOCGATHSTATS, &ifr) < 0) - err(1, ifr.ifr_name); + err(1, "%s", ifr.ifr_name); if (!getifstats(ifr.ifr_name, &itot, &otot)) - err(1, ifr.ifr_name); + err(1, "%s", ifr.ifr_name); printf("%8lu %8lu %7u %7u %7u %6u %6u %6u %7u %4u %3uM\n", itot - total.ast_rx_mgt, otot, @@ -341,7 +341,7 @@ ifr.ifr_data = (caddr_t) &stats; if (ioctl(s, SIOCGATHSTATS, &ifr) < 0) - err(1, ifr.ifr_name); + err(1, "%s", ifr.ifr_name); printstats(stdout, &stats); } return 0; Modified: madwifi/branches/madwifi-dfs/tools/80211stats.c =================================================================== --- madwifi/branches/madwifi-dfs/tools/80211stats.c 2012-05-01 19:52:26 UTC (rev 4179) +++ madwifi/branches/madwifi-dfs/tools/80211stats.c 2012-05-01 19:55:40 UTC (rev 4180) @@ -284,7 +284,7 @@ /* no args, just show global stats */ ifr.ifr_data = (caddr_t) &stats; if (ioctl(s, SIOCG80211STATS, &ifr) < 0) - err(1, ifr.ifr_name); + err(1, "%s", ifr.ifr_name); printstats(stdout, &stats); return 0; } Modified: madwifi/branches/madwifi-dfs/tools/athstats.c =================================================================== --- madwifi/branches/madwifi-dfs/tools/athstats.c 2012-05-01 19:52:26 UTC (rev 4179) +++ madwifi/branches/madwifi-dfs/tools/athstats.c 2012-05-01 19:55:40 UTC (rev 4180) @@ -285,9 +285,9 @@ if (line != 0) { ifr.ifr_data = (caddr_t) &cur; if (ioctl(s, SIOCGATHSTATS, &ifr) < 0) - err(1, ifr.ifr_name); + err(1, "%s", ifr.ifr_name); if (!getifstats(ifr.ifr_name, &icur, &ocur)) - err(1, ifr.ifr_name); + err(1, "%s", ifr.ifr_name); printf("%8lu %8lu %7u %7u %7u %6u %6u %6u %7u %4u %3uM\n", (icur - itot) - (cur.ast_rx_mgt - total.ast_rx_mgt), @@ -307,9 +307,9 @@ } else { ifr.ifr_data = (caddr_t) &total; if (ioctl(s, SIOCGATHSTATS, &ifr) < 0) - err(1, ifr.ifr_name); + err(1, "%s", ifr.ifr_name); if (!getifstats(ifr.ifr_name, &itot, &otot)) - err(1, ifr.ifr_name); + err(1, "%s", ifr.ifr_name); printf("%8lu %8lu %7u %7u %7u %6u %6u %6u %7u %4u %3uM\n", itot - total.ast_rx_mgt, otot, @@ -344,7 +344,7 @@ ifr.ifr_data = (caddr_t) &stats; if (ioctl(s, SIOCGATHSTATS, &ifr) < 0) - err(1, ifr.ifr_name); + err(1, "%s", ifr.ifr_name); printstats(stdout, &stats); } return 0; |
From: Pavel R. <svn...@ma...> - 2012-05-01 20:11:52
|
Project : madwifi Revision : 4179 Author : proski (Pavel Roskin) Date : 2012-05-01 21:52:26 +0200 (Tue, 01 May 2012) Log Message : Use "%s" in err() calls to fix a warning on Ubuntu 10.04 err() would be confused if the interface name has formatting characters. Affected Files: * madwifi/trunk/tools/80211stats.c updated * madwifi/trunk/tools/athstats.c updated Modified: madwifi/trunk/tools/80211stats.c =================================================================== --- madwifi/trunk/tools/80211stats.c 2012-01-30 19:56:17 UTC (rev 4178) +++ madwifi/trunk/tools/80211stats.c 2012-05-01 19:52:26 UTC (rev 4179) @@ -284,7 +284,7 @@ /* no args, just show global stats */ ifr.ifr_data = (caddr_t) &stats; if (ioctl(s, SIOCG80211STATS, &ifr) < 0) - err(1, ifr.ifr_name); + err(1, "%s", ifr.ifr_name); printstats(stdout, &stats); return 0; } Modified: madwifi/trunk/tools/athstats.c =================================================================== --- madwifi/trunk/tools/athstats.c 2012-01-30 19:56:17 UTC (rev 4178) +++ madwifi/trunk/tools/athstats.c 2012-05-01 19:52:26 UTC (rev 4179) @@ -285,9 +285,9 @@ if (line != 0) { ifr.ifr_data = (caddr_t) &cur; if (ioctl(s, SIOCGATHSTATS, &ifr) < 0) - err(1, ifr.ifr_name); + err(1, "%s", ifr.ifr_name); if (!getifstats(ifr.ifr_name, &icur, &ocur)) - err(1, ifr.ifr_name); + err(1, "%s", ifr.ifr_name); printf("%8lu %8lu %7u %7u %7u %6u %6u %6u %7u %4u %3uM\n", (icur - itot) - (cur.ast_rx_mgt - total.ast_rx_mgt), @@ -307,9 +307,9 @@ } else { ifr.ifr_data = (caddr_t) &total; if (ioctl(s, SIOCGATHSTATS, &ifr) < 0) - err(1, ifr.ifr_name); + err(1, "%s", ifr.ifr_name); if (!getifstats(ifr.ifr_name, &itot, &otot)) - err(1, ifr.ifr_name); + err(1, "%s", ifr.ifr_name); printf("%8lu %8lu %7u %7u %7u %6u %6u %6u %7u %4u %3uM\n", itot - total.ast_rx_mgt, otot, @@ -344,7 +344,7 @@ ifr.ifr_data = (caddr_t) &stats; if (ioctl(s, SIOCGATHSTATS, &ifr) < 0) - err(1, ifr.ifr_name); + err(1, "%s", ifr.ifr_name); printstats(stdout, &stats); } return 0; |
From: Pavel R. <svn...@ma...> - 2012-01-30 19:56:31
|
Project : madwifi Revision : 4178 Author : proski (Pavel Roskin) Date : 2012-01-30 20:56:17 +0100 (Mon, 30 Jan 2012) Log Message : Don't reference vlan_group without IEEE80211_VLAN_TAG_USED set struct vlan_group will be removed in Linux 3.3. Affected Files: * madwifi/branches/madwifi-0.9.4/net80211/ieee80211_linux.h updated * madwifi/branches/madwifi-dfs/net80211/ieee80211_linux.h updated * madwifi/branches/madwifi-dfs/net80211/ieee80211_skb.h updated Modified: madwifi/branches/madwifi-0.9.4/net80211/ieee80211_linux.h =================================================================== --- madwifi/branches/madwifi-0.9.4/net80211/ieee80211_linux.h 2012-01-30 19:55:03 UTC (rev 4177) +++ madwifi/branches/madwifi-0.9.4/net80211/ieee80211_linux.h 2012-01-30 19:56:17 UTC (rev 4178) @@ -566,8 +566,10 @@ struct net_device *); int ieee80211_create_vap(struct ieee80211com *, char *, struct net_device *, int, int); +#if IEEE80211_VLAN_TAG_USED void ieee80211_vlan_register(struct net_device *dev, struct vlan_group *grp); void ieee80211_vlan_add_vid(struct net_device *dev, unsigned short vid); void ieee80211_vlan_kill_vid(struct net_device *dev, unsigned short vid); +#endif #endif /* _NET80211_IEEE80211_LINUX_H_ */ Modified: madwifi/branches/madwifi-dfs/net80211/ieee80211_linux.h =================================================================== --- madwifi/branches/madwifi-dfs/net80211/ieee80211_linux.h 2012-01-30 19:55:03 UTC (rev 4177) +++ madwifi/branches/madwifi-dfs/net80211/ieee80211_linux.h 2012-01-30 19:56:17 UTC (rev 4178) @@ -643,8 +643,11 @@ struct net_device *); struct ieee80211vap *ieee80211_create_vap(struct ieee80211com *, char *, struct net_device *, int, int); + +#if IEEE80211_VLAN_TAG_USED void ieee80211_vlan_register(struct net_device *dev, struct vlan_group *grp); void ieee80211_vlan_add_vid(struct net_device *dev, unsigned short vid); void ieee80211_vlan_kill_vid(struct net_device *dev, unsigned short vid); +#endif #endif /* _NET80211_IEEE80211_LINUX_H_ */ Modified: madwifi/branches/madwifi-dfs/net80211/ieee80211_skb.h =================================================================== --- madwifi/branches/madwifi-dfs/net80211/ieee80211_skb.h 2012-01-30 19:55:03 UTC (rev 4177) +++ madwifi/branches/madwifi-dfs/net80211/ieee80211_skb.h 2012-01-30 19:56:17 UTC (rev 4178) @@ -113,8 +113,10 @@ #ifdef IEEE80211_DEBUG_REFCNT +#if IEEE80211_VLAN_TAG_USED int vlan_hwaccel_rx_debug(struct sk_buff *skb, struct vlan_group *grp, unsigned short vlan_tag, const char *func, int line); +#endif int netif_rx_debug(struct sk_buff *skb, const char *func, int line); struct sk_buff *alloc_skb_debug(unsigned int length, gfp_t gfp_mask, const char *func, int line); |
From: Pavel R. <svn...@ma...> - 2012-01-30 19:55:19
|
Project : madwifi Revision : 4177 Author : proski (Pavel Roskin) Date : 2012-01-30 20:55:03 +0100 (Mon, 30 Jan 2012) Log Message : Don't reference vlan_group without IEEE80211_VLAN_TAG_USED set struct vlan_group will be removed in Linux 3.3. Affected Files: * madwifi/trunk/net80211/ieee80211_linux.h updated * madwifi/trunk/net80211/ieee80211_skb.h updated Modified: madwifi/trunk/net80211/ieee80211_linux.h =================================================================== --- madwifi/trunk/net80211/ieee80211_linux.h 2011-11-22 17:30:17 UTC (rev 4176) +++ madwifi/trunk/net80211/ieee80211_linux.h 2012-01-30 19:55:03 UTC (rev 4177) @@ -643,8 +643,11 @@ struct net_device *); struct ieee80211vap *ieee80211_create_vap(struct ieee80211com *, char *, struct net_device *, int, int); + +#if IEEE80211_VLAN_TAG_USED void ieee80211_vlan_register(struct net_device *dev, struct vlan_group *grp); void ieee80211_vlan_add_vid(struct net_device *dev, unsigned short vid); void ieee80211_vlan_kill_vid(struct net_device *dev, unsigned short vid); +#endif #endif /* _NET80211_IEEE80211_LINUX_H_ */ Modified: madwifi/trunk/net80211/ieee80211_skb.h =================================================================== --- madwifi/trunk/net80211/ieee80211_skb.h 2011-11-22 17:30:17 UTC (rev 4176) +++ madwifi/trunk/net80211/ieee80211_skb.h 2012-01-30 19:55:03 UTC (rev 4177) @@ -113,8 +113,10 @@ #ifdef IEEE80211_DEBUG_REFCNT +#if IEEE80211_VLAN_TAG_USED int vlan_hwaccel_rx_debug(struct sk_buff *skb, struct vlan_group *grp, unsigned short vlan_tag, const char *func, int line); +#endif int netif_rx_debug(struct sk_buff *skb, const char *func, int line); struct sk_buff *alloc_skb_debug(unsigned int length, gfp_t gfp_mask, const char *func, int line); |
From: Pavel R. <svn...@ma...> - 2011-11-22 17:30:31
|
Project : madwifi Revision : 4176 Author : proski (Pavel Roskin) Date : 2011-11-22 18:30:17 +0100 (Tue, 22 Nov 2011) Log Message : Use ndo_set_rx_mode instead of ndo_set_multicast_list on Linux 3.2+ Affected Files: * madwifi/branches/madwifi-0.9.4/ath/if_ath.c updated * madwifi/branches/madwifi-0.9.4/net80211/ieee80211.c updated * madwifi/branches/madwifi-dfs/ath/if_ath.c updated * madwifi/branches/madwifi-dfs/net80211/ieee80211.c updated Modified: madwifi/branches/madwifi-0.9.4/ath/if_ath.c =================================================================== --- madwifi/branches/madwifi-0.9.4/ath/if_ath.c 2011-11-22 17:22:34 UTC (rev 4175) +++ madwifi/branches/madwifi-0.9.4/ath/if_ath.c 2011-11-22 17:30:17 UTC (rev 4176) @@ -402,7 +402,11 @@ .ndo_stop = ath_stop, .ndo_start_xmit = ath_hardstart, .ndo_tx_timeout = ath_tx_timeout, +#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,2,0) + .ndo_set_rx_mode = ath_mode_init, +#else .ndo_set_multicast_list = ath_mode_init, +#endif .ndo_do_ioctl = ath_ioctl, .ndo_get_stats = ath_getstats, .ndo_set_mac_address = ath_set_mac_address, Modified: madwifi/branches/madwifi-0.9.4/net80211/ieee80211.c =================================================================== --- madwifi/branches/madwifi-0.9.4/net80211/ieee80211.c 2011-11-22 17:22:34 UTC (rev 4175) +++ madwifi/branches/madwifi-0.9.4/net80211/ieee80211.c 2011-11-22 17:30:17 UTC (rev 4176) @@ -377,7 +377,11 @@ .ndo_open = ieee80211_open, .ndo_stop = ieee80211_stop, .ndo_start_xmit = ieee80211_hardstart, +#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,2,0) + .ndo_set_rx_mode = ieee80211_set_multicast_list, +#else .ndo_set_multicast_list = ieee80211_set_multicast_list, +#endif .ndo_change_mtu = ieee80211_change_mtu, .ndo_do_ioctl = ieee80211_ioctl, #if IEEE80211_VLAN_TAG_USED @@ -1542,11 +1546,15 @@ IEEE80211_UNLOCK_IRQ(ic); /* XXX merge multicast list into parent device */ -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,29) - parent->set_multicast_list(ic->ic_dev); +#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,2,0) + parent->netdev_ops->ndo_set_rx_mode(ic->ic_dev); #else +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,29) parent->netdev_ops->ndo_set_multicast_list(ic->ic_dev); +#else + parent->set_multicast_list(ic->ic_dev); #endif +#endif } void Modified: madwifi/branches/madwifi-dfs/ath/if_ath.c =================================================================== --- madwifi/branches/madwifi-dfs/ath/if_ath.c 2011-11-22 17:22:34 UTC (rev 4175) +++ madwifi/branches/madwifi-dfs/ath/if_ath.c 2011-11-22 17:30:17 UTC (rev 4176) @@ -524,7 +524,11 @@ .ndo_stop = ath_stop, .ndo_start_xmit = ath_hardstart, .ndo_tx_timeout = ath_tx_timeout, +#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,2,0) + .ndo_set_rx_mode = ath_mode_init, +#else .ndo_set_multicast_list = ath_mode_init, +#endif .ndo_do_ioctl = ath_ioctl, .ndo_get_stats = ath_getstats, .ndo_set_mac_address = ath_set_mac_address, Modified: madwifi/branches/madwifi-dfs/net80211/ieee80211.c =================================================================== --- madwifi/branches/madwifi-dfs/net80211/ieee80211.c 2011-11-22 17:22:34 UTC (rev 4175) +++ madwifi/branches/madwifi-dfs/net80211/ieee80211.c 2011-11-22 17:30:17 UTC (rev 4176) @@ -411,7 +411,11 @@ .ndo_open = ieee80211_open, .ndo_stop = ieee80211_stop, .ndo_start_xmit = ieee80211_hardstart, +#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,2,0) + .ndo_set_rx_mode = ieee80211_set_multicast_list, +#else .ndo_set_multicast_list = ieee80211_set_multicast_list, +#endif .ndo_change_mtu = ieee80211_change_mtu, .ndo_do_ioctl = ieee80211_ioctl, #if IEEE80211_VLAN_TAG_USED @@ -1806,11 +1810,15 @@ IEEE80211_UNLOCK_IRQ(ic); /* XXX: Merge multicast list into parent device */ -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,29) - parent->set_multicast_list(ic->ic_dev); +#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,2,0) + parent->netdev_ops->ndo_set_rx_mode(ic->ic_dev); #else +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,29) parent->netdev_ops->ndo_set_multicast_list(ic->ic_dev); +#else + parent->set_multicast_list(ic->ic_dev); #endif +#endif } void |
From: Pavel R. <svn...@ma...> - 2011-11-22 17:22:54
|
Project : madwifi Revision : 4175 Author : proski (Pavel Roskin) Date : 2011-11-22 18:22:34 +0100 (Tue, 22 Nov 2011) Log Message : Use ndo_set_rx_mode instead of ndo_set_multicast_list on Linux 3.2+ Affected Files: * madwifi/trunk/ath/if_ath.c updated * madwifi/trunk/net80211/ieee80211.c updated Modified: madwifi/trunk/ath/if_ath.c =================================================================== --- madwifi/trunk/ath/if_ath.c 2011-10-25 21:38:00 UTC (rev 4174) +++ madwifi/trunk/ath/if_ath.c 2011-11-22 17:22:34 UTC (rev 4175) @@ -511,7 +511,11 @@ .ndo_stop = ath_stop, .ndo_start_xmit = ath_hardstart, .ndo_tx_timeout = ath_tx_timeout, +#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,2,0) + .ndo_set_rx_mode = ath_mode_init, +#else .ndo_set_multicast_list = ath_mode_init, +#endif .ndo_do_ioctl = ath_ioctl, .ndo_get_stats = ath_getstats, .ndo_set_mac_address = ath_set_mac_address, Modified: madwifi/trunk/net80211/ieee80211.c =================================================================== --- madwifi/trunk/net80211/ieee80211.c 2011-10-25 21:38:00 UTC (rev 4174) +++ madwifi/trunk/net80211/ieee80211.c 2011-11-22 17:22:34 UTC (rev 4175) @@ -411,7 +411,11 @@ .ndo_open = ieee80211_open, .ndo_stop = ieee80211_stop, .ndo_start_xmit = ieee80211_hardstart, +#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,2,0) + .ndo_set_rx_mode = ieee80211_set_multicast_list, +#else .ndo_set_multicast_list = ieee80211_set_multicast_list, +#endif .ndo_change_mtu = ieee80211_change_mtu, .ndo_do_ioctl = ieee80211_ioctl, #if IEEE80211_VLAN_TAG_USED @@ -1806,11 +1810,15 @@ IEEE80211_UNLOCK_IRQ(ic); /* XXX: Merge multicast list into parent device */ -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,29) - parent->set_multicast_list(ic->ic_dev); +#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,2,0) + parent->netdev_ops->ndo_set_rx_mode(ic->ic_dev); #else +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,29) parent->netdev_ops->ndo_set_multicast_list(ic->ic_dev); +#else + parent->set_multicast_list(ic->ic_dev); #endif +#endif } void |
From: Pavel R. <svn...@ma...> - 2011-10-25 21:38:21
|
Project : madwifi Revision : 4174 Author : proski (Pavel Roskin) Date : 2011-10-25 23:38:00 +0200 (Tue, 25 Oct 2011) Log Message : Merge 4149:4172 from trunk Affected Files: * madwifi/branches/madwifi-dfs/Makefile.inc updated * madwifi/branches/madwifi-dfs/ath/if_ath.c updated * madwifi/branches/madwifi-dfs/ath/if_ath_pci.c updated * madwifi/branches/madwifi-dfs/ath/if_ath_radar.c updated * madwifi/branches/madwifi-dfs/ath/if_athvar.h updated * madwifi/branches/madwifi-dfs/ath_hal/ah.c updated * madwifi/branches/madwifi-dfs/ath_hal/ah_os.c updated * madwifi/branches/madwifi-dfs/ath_hal/ah_regdomain.c updated * madwifi/branches/madwifi-dfs/ath_hal/ar5211/ar5211_reset.c updated * madwifi/branches/madwifi-dfs/ath_hal/ar5212/ar2316.c updated * madwifi/branches/madwifi-dfs/ath_hal/ar5212/ar2317.c updated * madwifi/branches/madwifi-dfs/ath_hal/ar5212/ar2413.c updated * madwifi/branches/madwifi-dfs/ath_hal/ar5212/ar2425.c updated * madwifi/branches/madwifi-dfs/ath_hal/ar5212/ar5212_attach.c updated * madwifi/branches/madwifi-dfs/ath_hal/ar5212/ar5212_power.c updated * madwifi/branches/madwifi-dfs/ath_hal/ar5212/ar5212_reset.c updated * madwifi/branches/madwifi-dfs/ath_hal/ar5212/ar5413.c updated * madwifi/branches/madwifi-dfs/ath_hal/ar5416/ar5416_cal.c updated * madwifi/branches/madwifi-dfs/ath_hal/ar5416/ar5416_xmit.c updated * madwifi/branches/madwifi-dfs/ath_hal/ar5416/ar5416reg.h updated * madwifi/branches/madwifi-dfs/ath_rate/amrr/amrr.c updated * madwifi/branches/madwifi-dfs/ath_rate/minstrel/minstrel.c updated * madwifi/branches/madwifi-dfs/ath_rate/onoe/onoe.c updated * madwifi/branches/madwifi-dfs/include/compat.h updated * madwifi/branches/madwifi-dfs/net80211/ieee80211.c updated * madwifi/branches/madwifi-dfs/net80211/ieee80211_input.c updated * madwifi/branches/madwifi-dfs/net80211/ieee80211_linux.c updated * madwifi/branches/madwifi-dfs/net80211/ieee80211_linux.h updated * madwifi/branches/madwifi-dfs/net80211/ieee80211_node.c updated * madwifi/branches/madwifi-dfs/net80211/ieee80211_node.h updated * madwifi/branches/madwifi-dfs/net80211/ieee80211_skb.c updated * madwifi/branches/madwifi-dfs/net80211/ieee80211_var.h updated * madwifi/branches/madwifi-dfs/net80211/ieee80211_wireless.c updated * madwifi/branches/madwifi-dfs/net80211/if_media.c updated * madwifi/branches/madwifi-dfs/tools/wireless_copy.h updated Modified: madwifi/branches/madwifi-dfs/Makefile.inc =================================================================== --- madwifi/branches/madwifi-dfs/Makefile.inc 2011-10-07 21:43:03 UTC (rev 4173) +++ madwifi/branches/madwifi-dfs/Makefile.inc 2011-10-25 21:38:00 UTC (rev 4174) @@ -134,7 +134,7 @@ # TOOLS= $(TOP)/tools -WARNINGS = -Werror -Wall +WARNINGS = -Wall COPTS+= $(WARNINGS) INCS= -include $(TOP)/include/compat.h -I$(TOP)/include Modified: madwifi/branches/madwifi-dfs/ath/if_ath.c =================================================================== --- madwifi/branches/madwifi-dfs/ath/if_ath.c 2011-10-07 21:43:03 UTC (rev 4173) +++ madwifi/branches/madwifi-dfs/ath/if_ath.c 2011-10-25 21:38:00 UTC (rev 4174) @@ -1409,12 +1409,10 @@ /* If no default VAP debug flags are passed, allow a few to * transfer down from the driver to new VAPs so we can have load * time debugging for VAPs too. */ - vap->iv_debug = 0 | - ((sc->sc_debug & ATH_DEBUG_RATE) ? IEEE80211_MSG_XRATE : 0) | - ((sc->sc_debug & ATH_DEBUG_XMIT) ? IEEE80211_MSG_OUTPUT : 0) | - ((sc->sc_debug & ATH_DEBUG_RECV) ? IEEE80211_MSG_INPUT : 0) | - 0 - ; + vap->iv_debug = + ((sc->sc_debug & ATH_DEBUG_RATE) ? IEEE80211_MSG_XRATE : 0) | + ((sc->sc_debug & ATH_DEBUG_XMIT) ? IEEE80211_MSG_OUTPUT : 0) | + ((sc->sc_debug & ATH_DEBUG_RECV) ? IEEE80211_MSG_INPUT : 0); } ic->ic_debug = (sc->sc_default_ieee80211_debug & IEEE80211_MSG_IC); @@ -1519,7 +1517,9 @@ } if (sc->sc_hastsfadd) ath_hal_settsfadjust(sc->sc_ah, sc->sc_stagbeacons); - SET_NETDEV_DEV(dev, ATH_GET_NETDEV_DEV(mdev)); +#ifdef ATH_PCI + SET_NETDEV_DEV(dev, &((struct pci_dev *)sc->sc_bdev)->dev); +#endif /* complete setup */ (void) ieee80211_vap_attach(vap, ieee80211_media_change, ieee80211_media_status); @@ -1824,8 +1824,8 @@ return ret; /* Do the same as in ath_getchannels() */ - ath_radar_correct_dfs_flags(sc, channel); - + ath_radar_correct_dfs_flags(sc, channel); + /* Restore CHANNEL_DFS_CLEAR and CHANNEL_INTERFERENCE flags */ #define CHANNEL_DFS_FLAGS (CHANNEL_DFS_CLEAR|CHANNEL_INTERFERENCE) channel->privFlags = (channel->privFlags & ~CHANNEL_DFS_FLAGS) | @@ -2720,7 +2720,7 @@ struct ath_softc *sc = netdev_priv(dev); if (time_before(jiffies, sc->sc_ic.ic_bmiss_guard)) { - /* Beacon miss interrupt occured too short after last beacon + /* Beacon miss interrupt occurred too short after last beacon * timer configuration. Ignore it as it could be spurious. */ DPRINTF(sc, ATH_DEBUG_ANY, "Beacon miss ignored\n"); } else { @@ -5244,12 +5244,14 @@ } #endif avp = ATH_VAP(vap); - if (avp == NULL || avp->av_bcbuf == NULL) { - DPRINTF(sc, ATH_DEBUG_ANY, "Returning NULL, one of these " - "is NULL {avp=%p av_bcbuf=%p}\n", - avp, avp->av_bcbuf); + if (avp == NULL) { + DPRINTF(sc, ATH_DEBUG_ANY, "%s: avp is NULL\n", __func__); return NULL; } + if (avp->av_bcbuf == NULL) { + DPRINTF(sc, ATH_DEBUG_ANY, "%s: av_bcbuf is NULL\n", __func__); + return NULL; + } bf = avp->av_bcbuf; #ifdef ATH_SUPERG_DYNTURBO @@ -6334,7 +6336,7 @@ /* NB: last descriptor */ ds = prev->bf_desc; #endif - ts = &bf->bf_dsstatus.ds_txstat; + ts = &prev->bf_dsstatus.ds_txstat; status = ath_hal_txprocdesc( ah, ds, ts ); @@ -6529,7 +6531,7 @@ DPRINTF(sc, ATH_DEBUG_XMIT_PROC, "moved %d buffers from XR to NORMAL\n"m count); } -#endif +#endif /* NOT_YET */ return 0; } #endif @@ -10958,7 +10960,7 @@ * being very careful or taking something into account that I can't * find in the specs. * - * XXX: Update based on emperical evidence (potentially save 15us per + * XXX: Update based on empirical evidence (potentially save 15us per * timeout). */ return ath_slottime2timeout(sc, ath_distance2slottime(sc, distance)); } @@ -11477,7 +11479,7 @@ .proc_handler = ath_sysctl_halparam, .extra2 = (void *)ATH_INTMIT, }, - { 0 } + { } }; static void @@ -11672,21 +11674,21 @@ .maxlen = sizeof(ath_xchanmode), .proc_handler = proc_dointvec }, - { 0 } + { } }; static ctl_table ath_ath_table[] = { { ATH_INIT_CTL_NAME(DEV_ATH) .procname = "ath", .mode = 0555, .child = ath_static_sysctls - }, { 0 } + }, { } }; static ctl_table ath_root_table[] = { { ATH_INIT_CTL_NAME(CTL_DEV) .procname = "dev", .mode = 0555, .child = ath_ath_table - }, { 0 } + }, { } }; static struct ctl_table_header *ath_sysctl_header; @@ -12526,7 +12528,7 @@ atomic_dec(&sc->sc_txbuf_counter); #ifdef IEEE80211_DEBUG_REFCNT DPRINTF(sc, ATH_DEBUG_TXBUF, - "[TXBUF=%03d/%03d] returned txbuf %p.\n", + "[TXBUF=%03d/%03d] returned txbuf.\n", ath_get_buffer_count(sc), ATH_TXBUF); #endif /* #ifdef IEEE80211_DEBUG_REFCNT */ if (netif_queue_stopped(sc->sc_dev) && Modified: madwifi/branches/madwifi-dfs/ath/if_ath_pci.c =================================================================== --- madwifi/branches/madwifi-dfs/ath/if_ath_pci.c 2011-10-07 21:43:03 UTC (rev 4173) +++ madwifi/branches/madwifi-dfs/ath/if_ath_pci.c 2011-10-25 21:38:00 UTC (rev 4174) @@ -119,7 +119,7 @@ #endif { 0x168c, 0x002a, PCI_ANY_ID, PCI_ANY_ID }, /* AR9280 PCI Express */ { 0x168c, 0x9013, PCI_ANY_ID, PCI_ANY_ID }, /* sonicwall */ - { 0 } + { } }; static u16 ath_devidmap[][2] = { Modified: madwifi/branches/madwifi-dfs/ath/if_ath_radar.c =================================================================== --- madwifi/branches/madwifi-dfs/ath/if_ath_radar.c 2011-10-07 21:43:03 UTC (rev 4173) +++ madwifi/branches/madwifi-dfs/ath/if_ath_radar.c 2011-10-25 21:38:00 UTC (rev 4174) @@ -1701,9 +1701,8 @@ ath_rp_clear(sc); - sc->sc_rp = (struct ath_rp *)kzalloc( - sizeof(struct ath_rp) * - ATH_RADAR_PULSE_NR, GFP_KERNEL); + sc->sc_rp = kzalloc(sizeof(struct ath_rp) * ATH_RADAR_PULSE_NR, + GFP_KERNEL); if (sc->sc_rp == NULL) return; Modified: madwifi/branches/madwifi-dfs/ath/if_athvar.h =================================================================== --- madwifi/branches/madwifi-dfs/ath/if_athvar.h 2011-10-07 21:43:03 UTC (rev 4173) +++ madwifi/branches/madwifi-dfs/ath/if_athvar.h 2011-10-25 21:38:00 UTC (rev 4174) @@ -125,12 +125,6 @@ #define SET_NETDEV_DEV(ndev, pdev) #endif -#ifdef to_net_dev -#define ATH_GET_NETDEV_DEV(ndev) ((ndev)->dev.parent) -#else -#define ATH_GET_NETDEV_DEV(ndev) ((ndev)->class_dev.dev) -#endif - #if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,23) static inline struct net_device *_alloc_netdev(int sizeof_priv, const char *mask, void (*setup)(struct net_device *)) @@ -703,7 +697,7 @@ unsigned int sc_useintmit:1; /* Interference mitigation enabled? */ unsigned int sc_txcont:1; /* Is continuous transmit enabled? */ unsigned int sc_dfs_testmode:1; /* IF this is on, AP vaps will stay in - * 'channel availability check' indefinately, + * 'channel availability check' indefinitely, * reporting radar and interference detections. */ unsigned int sc_dmasize_stomp:1; /* Whether to stomp on DMA size. */ Modified: madwifi/branches/madwifi-dfs/ath_hal/ah.c =================================================================== --- madwifi/branches/madwifi-dfs/ath_hal/ah.c 2011-10-07 21:43:03 UTC (rev 4173) +++ madwifi/branches/madwifi-dfs/ath_hal/ah.c 2011-10-25 21:38:00 UTC (rev 4174) @@ -151,7 +151,7 @@ kbps = rates->info[rateix].rateKbps; /* - * index can be invalid duting dynamic Turbo transitions. + * index can be invalid during dynamic Turbo transitions. */ if(kbps == 0) return 0; switch (rates->info[rateix].phy) { Modified: madwifi/branches/madwifi-dfs/ath_hal/ah_os.c =================================================================== --- madwifi/branches/madwifi-dfs/ath_hal/ah_os.c 2011-10-07 21:43:03 UTC (rev 4173) +++ madwifi/branches/madwifi-dfs/ath_hal/ah_os.c 2011-10-25 21:38:00 UTC (rev 4174) @@ -1025,28 +1025,28 @@ .proc_handler = proc_dointvec }, #endif /* AH_DEBUG_ALQ */ - { 0 } + { } }; static ctl_table ath_hal_table[] = { { ATH_INIT_CTL_NAME(CTL_AUTO) .procname = "hal", .mode = 0555, .child = ath_hal_sysctls - }, { 0 } + }, { } }; static ctl_table ath_ath_table[] = { { ATH_INIT_CTL_NAME(DEV_ATH) .procname = "ath", .mode = 0555, .child = ath_hal_table - }, { 0 } + }, { } }; static ctl_table ath_root_table[] = { { ATH_INIT_CTL_NAME(CTL_DEV) .procname = "dev", .mode = 0555, .child = ath_ath_table - }, { 0 } + }, { } }; static struct ctl_table_header *ath_hal_sysctl_header; Modified: madwifi/branches/madwifi-dfs/ath_hal/ah_regdomain.c =================================================================== --- madwifi/branches/madwifi-dfs/ath_hal/ah_regdomain.c 2011-10-07 21:43:03 UTC (rev 4173) +++ madwifi/branches/madwifi-dfs/ath_hal/ah_regdomain.c 2011-10-25 21:38:00 UTC (rev 4174) @@ -2361,7 +2361,7 @@ return (bitmask[byteOffset] & val) != 0; } -/* Add given regclassid into regclassids array upto max of maxregids */ +/* Add given regclassid into regclassids array up to max of maxregids */ static void ath_add_regclassid(uint8_t *regclassids, u_int maxregids, u_int *nregids, uint8_t regclassid) Modified: madwifi/branches/madwifi-dfs/ath_hal/ar5211/ar5211_reset.c =================================================================== --- madwifi/branches/madwifi-dfs/ath_hal/ar5211/ar5211_reset.c 2011-10-07 21:43:03 UTC (rev 4173) +++ madwifi/branches/madwifi-dfs/ath_hal/ar5211/ar5211_reset.c 2011-10-25 21:38:00 UTC (rev 4174) @@ -940,7 +940,7 @@ } /* - * Read the NF and check it against the noise floor threshhold + * Read the NF and check it against the noise floor threshold * * Returns: TRUE if the NF is good */ Modified: madwifi/branches/madwifi-dfs/ath_hal/ar5212/ar2316.c =================================================================== --- madwifi/branches/madwifi-dfs/ath_hal/ar5212/ar2316.c 2011-10-07 21:43:03 UTC (rev 4173) +++ madwifi/branches/madwifi-dfs/ath_hal/ar5212/ar2316.c 2011-10-25 21:38:00 UTC (rev 4174) @@ -381,9 +381,9 @@ * change pwr_I_0 to signed 5-bits. */ int16_t Pmin_t2[MAX_NUM_PDGAINS_PER_CHANNEL]; - /* to accomodate -ve power levels later on. */ + /* to accommodate -ve power levels later on. */ int16_t Pmax_t2[MAX_NUM_PDGAINS_PER_CHANNEL]; - /* to accomodate -ve power levels later on */ + /* to accommodate -ve power levels later on */ uint16_t numVpd = 0; uint16_t Vpd_step; int16_t tmpVal ; Modified: madwifi/branches/madwifi-dfs/ath_hal/ar5212/ar2317.c =================================================================== --- madwifi/branches/madwifi-dfs/ath_hal/ar5212/ar2317.c 2011-10-07 21:43:03 UTC (rev 4173) +++ madwifi/branches/madwifi-dfs/ath_hal/ar5212/ar2317.c 2011-10-25 21:38:00 UTC (rev 4174) @@ -358,9 +358,9 @@ * change pwr_I_0 to signed 5-bits. */ int16_t Pmin_t2[MAX_NUM_PDGAINS_PER_CHANNEL]; - /* to accomodate -ve power levels later on. */ + /* to accommodate -ve power levels later on. */ int16_t Pmax_t2[MAX_NUM_PDGAINS_PER_CHANNEL]; - /* to accomodate -ve power levels later on */ + /* to accommodate -ve power levels later on */ uint16_t numVpd = 0; uint16_t Vpd_step; int16_t tmpVal ; Modified: madwifi/branches/madwifi-dfs/ath_hal/ar5212/ar2413.c =================================================================== --- madwifi/branches/madwifi-dfs/ath_hal/ar5212/ar2413.c 2011-10-07 21:43:03 UTC (rev 4173) +++ madwifi/branches/madwifi-dfs/ath_hal/ar5212/ar2413.c 2011-10-25 21:38:00 UTC (rev 4174) @@ -375,9 +375,9 @@ * change pwr_I_0 to signed 5-bits. */ int16_t Pmin_t2[MAX_NUM_PDGAINS_PER_CHANNEL]; - /* to accomodate -ve power levels later on. */ + /* to accommodate -ve power levels later on. */ int16_t Pmax_t2[MAX_NUM_PDGAINS_PER_CHANNEL]; - /* to accomodate -ve power levels later on */ + /* to accommodate -ve power levels later on */ uint16_t numVpd = 0; uint16_t Vpd_step; int16_t tmpVal ; Modified: madwifi/branches/madwifi-dfs/ath_hal/ar5212/ar2425.c =================================================================== --- madwifi/branches/madwifi-dfs/ath_hal/ar5212/ar2425.c 2011-10-07 21:43:03 UTC (rev 4173) +++ madwifi/branches/madwifi-dfs/ath_hal/ar5212/ar2425.c 2011-10-25 21:38:00 UTC (rev 4174) @@ -380,9 +380,9 @@ * change pwr_I_0 to signed 5-bits. */ static int16_t Pmin_t2[MAX_NUM_PDGAINS_PER_CHANNEL]; - /* to accomodate -ve power levels later on. */ + /* to accommodate -ve power levels later on. */ static int16_t Pmax_t2[MAX_NUM_PDGAINS_PER_CHANNEL]; - /* to accomodate -ve power levels later on */ + /* to accommodate -ve power levels later on */ uint16_t numVpd = 0; uint16_t Vpd_step; int16_t tmpVal ; Modified: madwifi/branches/madwifi-dfs/ath_hal/ar5212/ar5212_attach.c =================================================================== --- madwifi/branches/madwifi-dfs/ath_hal/ar5212/ar5212_attach.c 2011-10-07 21:43:03 UTC (rev 4173) +++ madwifi/branches/madwifi-dfs/ath_hal/ar5212/ar5212_attach.c 2011-10-25 21:38:00 UTC (rev 4174) @@ -836,7 +836,7 @@ pCap->halRfSilentSupport = AH_TRUE; } - /* NB: this is a guess, noone seems to know the answer */ + /* NB: this is a guess, no one seems to know the answer */ ahpriv->ah_rxornIsFatal = (AH_PRIVATE(ah)->ah_macVersion < AR_SREV_VERSION_VENICE); Modified: madwifi/branches/madwifi-dfs/ath_hal/ar5212/ar5212_power.c =================================================================== --- madwifi/branches/madwifi-dfs/ath_hal/ar5212/ar5212_power.c 2011-10-07 21:43:03 UTC (rev 4173) +++ madwifi/branches/madwifi-dfs/ath_hal/ar5212/ar5212_power.c 2011-10-25 21:38:00 UTC (rev 4174) @@ -51,7 +51,7 @@ * which when blindly written back with OS_REG_RMW_FIELD * enables the MIB interrupt for the sleep performance * counters. This can result in an interrupt storm when - * ANI is in operation as noone knows to turn off the MIB + * ANI is in operation as no one knows to turn off the MIB * interrupt cause. */ scr = OS_REG_READ(ah, AR_SCR); Modified: madwifi/branches/madwifi-dfs/ath_hal/ar5212/ar5212_reset.c =================================================================== --- madwifi/branches/madwifi-dfs/ath_hal/ar5212/ar5212_reset.c 2011-10-07 21:43:03 UTC (rev 4173) +++ madwifi/branches/madwifi-dfs/ath_hal/ar5212/ar5212_reset.c 2011-10-25 21:38:00 UTC (rev 4174) @@ -1257,7 +1257,7 @@ } /* - * Read the NF and check it against the noise floor threshhold + * Read the NF and check it against the noise floor threshold */ int16_t ar5212GetNf(struct ath_hal *ah, HAL_CHANNEL_INTERNAL *chan) Modified: madwifi/branches/madwifi-dfs/ath_hal/ar5212/ar5413.c =================================================================== --- madwifi/branches/madwifi-dfs/ath_hal/ar5212/ar5413.c 2011-10-07 21:43:03 UTC (rev 4173) +++ madwifi/branches/madwifi-dfs/ath_hal/ar5212/ar5413.c 2011-10-25 21:38:00 UTC (rev 4174) @@ -411,9 +411,9 @@ * change pwr_I_0 to signed 5-bits. */ int16_t Pmin_t2[MAX_NUM_PDGAINS_PER_CHANNEL]; - /* to accomodate -ve power levels later on. */ + /* to accommodate -ve power levels later on. */ int16_t Pmax_t2[MAX_NUM_PDGAINS_PER_CHANNEL]; - /* to accomodate -ve power levels later on */ + /* to accommodate -ve power levels later on */ uint16_t numVpd = 0; uint16_t Vpd_step; int16_t tmpVal ; Modified: madwifi/branches/madwifi-dfs/ath_hal/ar5416/ar5416_cal.c =================================================================== --- madwifi/branches/madwifi-dfs/ath_hal/ar5416/ar5416_cal.c 2011-10-07 21:43:03 UTC (rev 4173) +++ madwifi/branches/madwifi-dfs/ath_hal/ar5416/ar5416_cal.c 2011-10-25 21:38:00 UTC (rev 4174) @@ -621,7 +621,7 @@ } /* - * Read the NF and check it against the noise floor threshhold + * Read the NF and check it against the noise floor threshold */ static int16_t ar5416GetNf(struct ath_hal *ah, HAL_CHANNEL_INTERNAL *chan) Modified: madwifi/branches/madwifi-dfs/ath_hal/ar5416/ar5416_xmit.c =================================================================== --- madwifi/branches/madwifi-dfs/ath_hal/ar5416/ar5416_xmit.c 2011-10-07 21:43:03 UTC (rev 4173) +++ madwifi/branches/madwifi-dfs/ath_hal/ar5416/ar5416_xmit.c 2011-10-25 21:38:00 UTC (rev 4174) @@ -563,7 +563,7 @@ } /* - * These fields are not used. Zero these to preserve compatability + * These fields are not used. Zero these to preserve compatibility * with existing drivers. */ ts->ts_virtcol = MS(ads->ds_ctl1, AR_VirtRetryCnt); Modified: madwifi/branches/madwifi-dfs/ath_hal/ar5416/ar5416reg.h =================================================================== --- madwifi/branches/madwifi-dfs/ath_hal/ar5416/ar5416reg.h 2011-10-07 21:43:03 UTC (rev 4173) +++ madwifi/branches/madwifi-dfs/ath_hal/ar5416/ar5416reg.h 2011-10-25 21:38:00 UTC (rev 4174) @@ -192,10 +192,10 @@ #define AR_PCIE_PM_CTRL_ENA 0x00080000 #define AR_AHB_EXACT_WR_EN 0x00000000 /* write exact bytes */ -#define AR_AHB_BUF_WR_EN 0x00000001 /* buffer write upto cacheline*/ +#define AR_AHB_BUF_WR_EN 0x00000001 /* buffer write up to cacheline*/ #define AR_AHB_EXACT_RD_EN 0x00000000 /* read exact bytes */ -#define AR_AHB_CACHELINE_RD_EN 0x00000002 /* read upto end of cacheline */ -#define AR_AHB_PREFETCH_RD_EN 0x00000004 /* prefetch upto page boundary*/ +#define AR_AHB_CACHELINE_RD_EN 0x00000002 /* read up to end of cacheline */ +#define AR_AHB_PREFETCH_RD_EN 0x00000004 /* prefetch up to page boundary*/ #define AR_AHB_PAGE_SIZE_1K 0x00000000 /* set page-size as 1k */ #define AR_AHB_PAGE_SIZE_2K 0x00000008 /* set page-size as 2k */ #define AR_AHB_PAGE_SIZE_4K 0x00000010 /* set page-size as 4k */ @@ -416,7 +416,7 @@ #define AR_PCU_MISS_BCN_IN_SLEEP 0x00004000 /* count bmiss's when sleeping */ #define AR_PCU_BUG_12306_FIX_ENA 0x00020000 /* use rx_clear to count sifs */ #define AR_PCU_FORCE_QUIET_COLL 0x00040000 /* kill xmit for channel change */ -#define AR_PCU_TBTT_PROTECT 0x00200000 /* no xmit upto tbtt+20 uS */ +#define AR_PCU_TBTT_PROTECT 0x00200000 /* no xmit up to tbtt+20 uS */ #define AR_PCU_CLEAR_VMF 0x01000000 /* clear vmf mode (fast cc)*/ #define AR_PCU_CLEAR_BA_VALID 0x04000000 /* clear ba state */ Modified: madwifi/branches/madwifi-dfs/ath_rate/amrr/amrr.c =================================================================== --- madwifi/branches/madwifi-dfs/ath_rate/amrr/amrr.c 2011-10-07 21:43:03 UTC (rev 4173) +++ madwifi/branches/madwifi-dfs/ath_rate/amrr/amrr.c 2011-10-25 21:38:00 UTC (rev 4174) @@ -516,28 +516,28 @@ .extra2 = &maxint, .proc_handler = proc_dointvec_minmax }, - { 0 } + { } }; static ctl_table ath_rate_table[] = { { ATH_INIT_CTL_NAME(CTL_AUTO) .procname = "rate_amrr", .mode = 0555, .child = ath_rate_static_sysctls - }, { 0 } + }, { } }; static ctl_table ath_ath_table[] = { { ATH_INIT_CTL_NAME(DEV_ATH) .procname = "ath", .mode = 0555, .child = ath_rate_table - }, { 0 } + }, { } }; static ctl_table ath_root_table[] = { { ATH_INIT_CTL_NAME(CTL_DEV) .procname = "dev", .mode = 0555, .child = ath_ath_table - }, { 0 } + }, { } }; static struct ctl_table_header *ath_sysctl_header; Modified: madwifi/branches/madwifi-dfs/ath_rate/minstrel/minstrel.c =================================================================== --- madwifi/branches/madwifi-dfs/ath_rate/minstrel/minstrel.c 2011-10-07 21:43:03 UTC (rev 4173) +++ madwifi/branches/madwifi-dfs/ath_rate/minstrel/minstrel.c 2011-10-25 21:38:00 UTC (rev 4174) @@ -61,7 +61,7 @@ * * It is not an aimless search, there is some direction to the search * pattern. But then, the minstels of old only sung where they thought - * they would get an income. Similarily, we direct thesearch a little. + * they would get an income. Similarly, we direct the search a little. * * Enjoy. Derek Smithies. */ Modified: madwifi/branches/madwifi-dfs/ath_rate/onoe/onoe.c =================================================================== --- madwifi/branches/madwifi-dfs/ath_rate/onoe/onoe.c 2011-10-07 21:43:03 UTC (rev 4173) +++ madwifi/branches/madwifi-dfs/ath_rate/onoe/onoe.c 2011-10-25 21:38:00 UTC (rev 4174) @@ -463,28 +463,28 @@ .maxlen = sizeof(ath_rate_raise_threshold), .proc_handler = proc_dointvec }, - { 0 } + { } }; static ctl_table ath_rate_table[] = { { ATH_INIT_CTL_NAME(CTL_AUTO) .procname = "rate_onoe", .mode = 0555, .child = ath_rate_static_sysctls - }, { 0 } + }, { } }; static ctl_table ath_ath_table[] = { { ATH_INIT_CTL_NAME(DEV_ATH) .procname = "ath", .mode = 0555, .child = ath_rate_table - }, { 0 } + }, { } }; static ctl_table ath_root_table[] = { { ATH_INIT_CTL_NAME(CTL_DEV) .procname = "dev", .mode = 0555, .child = ath_ath_table - }, { 0 } + }, { } }; static struct ctl_table_header *ath_sysctl_header; Modified: madwifi/branches/madwifi-dfs/include/compat.h =================================================================== --- madwifi/branches/madwifi-dfs/include/compat.h 2011-10-07 21:43:03 UTC (rev 4173) +++ madwifi/branches/madwifi-dfs/include/compat.h 2011-10-25 21:38:00 UTC (rev 4174) @@ -78,9 +78,11 @@ #endif #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,34) +#ifndef netdev_for_each_mc_addr #define netdev_for_each_mc_addr(mclist, dev) \ - for (mclist = dev->mc_list; mclist; mclist = mclist->next) + for (mclist = (dev)->mc_list; mclist; mclist = mclist->next) #endif +#endif #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,35) #define ath_netdev_hw_addr dev_mc_list @@ -92,7 +94,7 @@ /* * BSD/Linux compatibility shims. These are used mainly to - * minimize differences when importing necesary BSD code. + * minimize differences when importing necessary BSD code. */ #define NBBY 8 /* number of bits/byte */ Modified: madwifi/branches/madwifi-dfs/net80211/ieee80211.c =================================================================== --- madwifi/branches/madwifi-dfs/net80211/ieee80211.c 2011-10-07 21:43:03 UTC (rev 4173) +++ madwifi/branches/madwifi-dfs/net80211/ieee80211.c 2011-10-25 21:38:00 UTC (rev 4174) @@ -1847,7 +1847,7 @@ * NB: this is not quite right, since we should have one of: * 'I': indoor only * 'O': outdoor only - * ' ': all enviroments + * ' ': all environments * we currently can only provide 'I' or ' '. */ ic->ic_country_ie.country_str[2] = 'I'; Modified: madwifi/branches/madwifi-dfs/net80211/ieee80211_input.c =================================================================== --- madwifi/branches/madwifi-dfs/net80211/ieee80211_input.c 2011-10-07 21:43:03 UTC (rev 4173) +++ madwifi/branches/madwifi-dfs/net80211/ieee80211_input.c 2011-10-25 21:38:00 UTC (rev 4174) @@ -391,7 +391,7 @@ /* since ieee80211_input() can be called multiple times for * flooding VAPs when we don't know which VAP needs the packet - * we don't want to update the wrong state when ni is assigned - * to the bss node to accomodate this case. */ + * to the bss node to accommodate this case. */ if (IEEE80211_ADDR_EQ(wh->i_addr2, ni->ni_macaddr)) { ni->ni_rssi = rssi; ni->ni_rtsf = rtsf; @@ -1037,7 +1037,7 @@ if (more_frag) { if (skb_is_nonlinear(skb)) { /* - * We need a continous buffer to + * We need a continuous buffer to * assemble fragments */ ni->ni_rxfrag = skb_copy(skb, GFP_ATOMIC); @@ -1180,11 +1180,13 @@ skb->protocol = eth_type_trans(skb, dev); #endif tni = SKB_NI(skb); +#if IEEE80211_VLAN_TAG_USED if ((ni->ni_vlan != 0) && (vap->iv_vlgrp != NULL)) /* Attach VLAN tag. */ ret = vlan_hwaccel_rx(skb, vap->iv_vlgrp, ni->ni_vlan); else +#endif ret = netif_rx(skb); if (ret == NET_RX_DROP) vap->iv_devstats.rx_dropped++; Modified: madwifi/branches/madwifi-dfs/net80211/ieee80211_linux.c =================================================================== --- madwifi/branches/madwifi-dfs/net80211/ieee80211_linux.c 2011-10-07 21:43:03 UTC (rev 4173) +++ madwifi/branches/madwifi-dfs/net80211/ieee80211_linux.c 2011-10-25 21:38:00 UTC (rev 4174) @@ -99,7 +99,7 @@ }; static struct attribute_group ieee80211_attr_grp = { - .name = NULL, /* No seperate (sub-)directory */ + .name = NULL, /* No separate (sub-)directory */ .attrs = ieee80211_sysfs_attrs }; #endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,17) */ @@ -146,11 +146,7 @@ u_int len; len = roundup(sizeof(struct ieee80211_frame) + pktlen, 4); -#ifdef IEEE80211_DEBUG_REFCNT - skb = ieee80211_dev_alloc_skb_debug(len + align - 1, func, line); -#else skb = ieee80211_dev_alloc_skb(len + align - 1); -#endif if (skb != NULL) { u_int off = ((unsigned long) skb->data) % align; if (off != 0) @@ -935,7 +931,7 @@ .mode = 0444, .proc_handler = proc_dostring }, - { 0 } + { } }; void Modified: madwifi/branches/madwifi-dfs/net80211/ieee80211_linux.h =================================================================== --- madwifi/branches/madwifi-dfs/net80211/ieee80211_linux.h 2011-10-07 21:43:03 UTC (rev 4173) +++ madwifi/branches/madwifi-dfs/net80211/ieee80211_linux.h 2011-10-25 21:38:00 UTC (rev 4174) @@ -615,7 +615,8 @@ char *); void ieee80211_proc_cleanup(struct ieee80211vap *); -#if defined(CONFIG_VLAN_8021Q) || defined(CONFIG_VLAN_8021Q_MODULE) +#if LINUX_VERSION_CODE < KERNEL_VERSION(3,1,0) && \ + (defined(CONFIG_VLAN_8021Q) || defined(CONFIG_VLAN_8021Q_MODULE)) #define IEEE80211_VLAN_TAG_USED 1 #ifndef VLAN_GROUP_ARRAY_PART_LEN Modified: madwifi/branches/madwifi-dfs/net80211/ieee80211_node.c =================================================================== --- madwifi/branches/madwifi-dfs/net80211/ieee80211_node.c 2011-10-07 21:43:03 UTC (rev 4173) +++ madwifi/branches/madwifi-dfs/net80211/ieee80211_node.c 2011-10-25 21:38:00 UTC (rev 4174) @@ -374,7 +374,7 @@ IEEE80211_DPRINTF(vap, IEEE80211_MSG_ASSOC, "%s: ni:%p allocated for " MAC_FMT "\n", __func__, ni, MAC_ADDR(vap->iv_myaddr)); - KASSERT(ni != NULL, ("unable to setup inital BSS node")); + KASSERT(ni != NULL, ("unable to setup initial BSS node")); vap->iv_bss = PASS_NODE(ni); KASSERT((atomic_read(&vap->iv_bss->ni_refcnt) == 2), @@ -702,7 +702,7 @@ if (ni == NULL) { IEEE80211_DPRINTF(vap, IEEE80211_MSG_NODE, "%s: Unable to allocate node for BSS: " MAC_FMT "\n", __func__, - MAC_ADDR(ni->ni_macaddr)); + MAC_ADDR(se->se_macaddr)); return 0; } } Modified: madwifi/branches/madwifi-dfs/net80211/ieee80211_node.h =================================================================== --- madwifi/branches/madwifi-dfs/net80211/ieee80211_node.h 2011-10-07 21:43:03 UTC (rev 4173) +++ madwifi/branches/madwifi-dfs/net80211/ieee80211_node.h 2011-10-25 21:38:00 UTC (rev 4174) @@ -279,7 +279,7 @@ /* Reference counting only needs to be locked out against the transitions, * 0->1 and 1->0 (i.e., when we do not own the reference we are getting). * This only happens when finding the a node reference from the node table, - * which is locked seperately. Thus, we do not need to lock the follwoing + * which is locked separately. Thus, we do not need to lock the following * functions. * Increment the reference counter for ieee80211_node *. */ struct ieee80211_node *ieee80211_ref_node(struct ieee80211_node *ni); Modified: madwifi/branches/madwifi-dfs/net80211/ieee80211_skb.c =================================================================== --- madwifi/branches/madwifi-dfs/net80211/ieee80211_skb.c 2011-10-07 21:43:03 UTC (rev 4173) +++ madwifi/branches/madwifi-dfs/net80211/ieee80211_skb.c 2011-10-25 21:38:00 UTC (rev 4174) @@ -273,20 +273,20 @@ { if (NULL == skb) { skb_print_message(0 /* show_counter */, - skb, func2, line2, + skb, func, line, "ERROR: NULL skb received. Skipping."); return NULL; } if (M_FLAG_GET(skb, M_SKB_TRACKED)) { skb_print_message(0 /* show_counter */, - skb, func2, line2, + skb, func, line, "ERROR: Already tracked skb received. Skipping."); dump_stack(); return skb; } if (skb_shared(skb)) { skb_print_message(0 /* show_counter */, - skb, func2, line2, + skb, func, line, "ERROR: Shared skb received. References leaked??"); dump_stack(); } @@ -294,7 +294,7 @@ atomic_inc(&skb_refs_counter); M_FLAG_SET(skb, M_SKB_TRACKED); print_skb_trackchange_message(skb, users_adjustment, - func2, line2, + func, line, " is now ** TRACKED **"); #ifdef IEEE80211_DEBUG_REFCNT_SKBDEST /* Install our debug destructor, chaining to the original... */ @@ -380,7 +380,7 @@ if (skb_shared(skb)) { atomic_dec(&skb_refs_counter); - print_skb_refchange_message(skb, -1, func2, line2); + print_skb_refchange_message(skb, -1, func, line); } else { if (SKB_NI(skb) != NULL) { @@ -570,6 +570,7 @@ #ifdef IEEE80211_DEBUG_REFCNT +#if IEEE80211_VLAN_TAG_USED int vlan_hwaccel_rx_debug(struct sk_buff *skb, struct vlan_group *grp, unsigned short vlan_tag, const char *func, int line) { @@ -577,6 +578,7 @@ untrack_skb(skb, 0, __func__, __LINE__), grp, vlan_tag); } +#endif int netif_rx_debug(struct sk_buff *skb, const char *func, int line) { return netif_rx(untrack_skb(skb, 0, __func__, __LINE__)); @@ -672,7 +674,7 @@ const char *func, int line) { /* NOT so fast... */ - unref_skb(skb, UNREF_USE_DEV_KFREE_SKB_ANY, func, line, __func__, __LINE__); + unref_skb(skb, UNREF_USE_DEV_KFREE_SKB_ANY, func, line); } struct sk_buff *skb_unshare_debug(struct sk_buff *skb, gfp_t pri, Modified: madwifi/branches/madwifi-dfs/net80211/ieee80211_var.h =================================================================== --- madwifi/branches/madwifi-dfs/net80211/ieee80211_var.h 2011-10-07 21:43:03 UTC (rev 4173) +++ madwifi/branches/madwifi-dfs/net80211/ieee80211_var.h 2011-10-25 21:38:00 UTC (rev 4174) @@ -76,7 +76,7 @@ * This is halfway between the 10@100ms default from prior hardcoded setting for * software beacon miss timers, and the 7@100ms default from prior hardcoded * timer value for hardware beacon miss timer. - * Based upon emperical evidence and practices of commercial vendors, I believe + * Based upon empirical evidence and practices of commercial vendors, I believe * this should really be 2500ms by default. */ #define IEEE80211_BMISSTHRESH_DEFAULT_MS 850 Modified: madwifi/branches/madwifi-dfs/net80211/ieee80211_wireless.c =================================================================== --- madwifi/branches/madwifi-dfs/net80211/ieee80211_wireless.c 2011-10-07 21:43:03 UTC (rev 4173) +++ madwifi/branches/madwifi-dfs/net80211/ieee80211_wireless.c 2011-10-25 21:38:00 UTC (rev 4174) @@ -983,7 +983,7 @@ } /* Atheros' RSSI value is SNR: 0 -> 60 for old chipsets. Range - * for newer chipsets is unknown. This value is arbitarily chosen + * for newer chipsets is unknown. This value is arbitrarily chosen * to give an indication that full rate will be available and to be * a practicable maximum. */ range->max_qual.qual = 70; @@ -2186,7 +2186,7 @@ strcat(name, "-xr"); /* * Create a new XR vap. If the normal VAP is already up, - * bring up the XR vap aswell. + * bring up the XR vap as well. */ vap->iv_ath_cap &= ~IEEE80211_ATHC_TURBOP; /* turn off turbo */ ieee80211_scan_flush(ic); /* NB: could optimize */ Modified: madwifi/branches/madwifi-dfs/net80211/if_media.c =================================================================== --- madwifi/branches/madwifi-dfs/net80211/if_media.c 2011-10-07 21:43:03 UTC (rev 4173) +++ madwifi/branches/madwifi-dfs/net80211/if_media.c 2011-10-25 21:38:00 UTC (rev 4174) @@ -292,8 +292,8 @@ return (-EINVAL); if (ifmr->ifm_count != 0) { - kptr = (int *)kmalloc(ifmr->ifm_count * sizeof(int), - GFP_KERNEL); + kptr = kmalloc(ifmr->ifm_count * sizeof(int), + GFP_KERNEL); if (kptr == NULL) return (-ENOMEM); Modified: madwifi/branches/madwifi-dfs/tools/wireless_copy.h =================================================================== --- madwifi/branches/madwifi-dfs/tools/wireless_copy.h 2011-10-07 21:43:03 UTC (rev 4173) +++ madwifi/branches/madwifi-dfs/tools/wireless_copy.h 2011-10-25 21:38:00 UTC (rev 4174) @@ -1065,7 +1065,7 @@ */ struct iw_event { - __u16 len; /* Real lenght of this stuff */ + __u16 len; /* Real length of this stuff */ __u16 cmd; /* Wireless IOCTL */ union iwreq_data u; /* IOCTL fixed payload */ }; |
From: Pavel R. <svn...@ma...> - 2011-10-07 21:43:17
|
Project : madwifi Revision : 4173 Author : proski (Pavel Roskin) Date : 2011-10-07 23:43:03 +0200 (Fri, 07 Oct 2011) Log Message : Remove -Werror from WARNINGS It's impossible to eliminate all warnings with all combinations of kernels and compilers. Users are punished for using untested combinations that should be OK. Other projects don't use -Werror and nothing bad happens. Future compilers would surely introduce new warnings. MadWifi doesn't need to break because of that. There is no way to make -Werror apply to MadWifi code but not to the kernel headers. Linux kernel doesn't use -Werror, why should MadWifi? Using -Werror creates a false sense of security. It's easy to assume that the code is warning-free at least on the developers' systems. However, broken code was committed in the past that would not compile at all. Code quality means more that absence of warnings. It cannot be ensured by -Werror. Affected Files: * madwifi/branches/madwifi-0.9.4/Makefile.inc updated Modified: madwifi/branches/madwifi-0.9.4/Makefile.inc =================================================================== --- madwifi/branches/madwifi-0.9.4/Makefile.inc 2011-10-07 21:42:25 UTC (rev 4172) +++ madwifi/branches/madwifi-0.9.4/Makefile.inc 2011-10-07 21:43:03 UTC (rev 4173) @@ -146,7 +146,7 @@ # TOOLS= $(TOP)/tools -WARNINGS = -Werror -Wall +WARNINGS = -Wall COPTS+= $(WARNINGS) INCS= -include $(TOP)/include/compat.h -I$(TOP)/include |
From: Pavel R. <svn...@ma...> - 2011-10-07 21:42:38
|
Project : madwifi Revision : 4172 Author : proski (Pavel Roskin) Date : 2011-10-07 23:42:25 +0200 (Fri, 07 Oct 2011) Log Message : Remove -Werror from WARNINGS It's impossible to eliminate all warnings with all combinations of kernels and compilers. Users are punished for using untested combinations that should be OK. Other projects don't use -Werror and nothing bad happens. Future compilers would surely introduce new warnings. MadWifi doesn't need to break because of that. There is no way to make -Werror apply to MadWifi code but not to the kernel headers. Linux kernel doesn't use -Werror, why should MadWifi? Using -Werror creates a false sense of security. It's easy to assume that the code is warning-free at least on the developers' systems. However, broken code was committed in the past that would not compile at all. Code quality means more that absence of warnings. It cannot be ensured by -Werror. Affected Files: * madwifi/trunk/Makefile.inc updated Modified: madwifi/trunk/Makefile.inc =================================================================== --- madwifi/trunk/Makefile.inc 2011-10-07 21:31:51 UTC (rev 4171) +++ madwifi/trunk/Makefile.inc 2011-10-07 21:42:25 UTC (rev 4172) @@ -134,7 +134,7 @@ # TOOLS= $(TOP)/tools -WARNINGS = -Werror -Wall +WARNINGS = -Wall COPTS+= $(WARNINGS) INCS= -include $(TOP)/include/compat.h -I$(TOP)/include |
From: Pavel R. <svn...@ma...> - 2011-10-07 21:32:05
|
Project : madwifi Revision : 4171 Author : proski (Pavel Roskin) Date : 2011-10-07 23:31:51 +0200 (Fri, 07 Oct 2011) Log Message : Eliminate ATH_GET_NETDEV_DEV, it breaks on some CentOS kernels Instead, use sc->sc_bdev to find the physical device. sc->sc_bdev is NULL on AHB and we don't use SET_NETDEV_DEV on AHB anyway, so do it on PCI only. Affected Files: * madwifi/branches/madwifi-0.9.4/ath/if_ath.c updated * madwifi/branches/madwifi-0.9.4/ath/if_athvar.h updated Modified: madwifi/branches/madwifi-0.9.4/ath/if_ath.c =================================================================== --- madwifi/branches/madwifi-0.9.4/ath/if_ath.c 2011-10-07 21:30:59 UTC (rev 4170) +++ madwifi/branches/madwifi-0.9.4/ath/if_ath.c 2011-10-07 21:31:51 UTC (rev 4171) @@ -1207,7 +1207,9 @@ } if (sc->sc_hastsfadd) ath_hal_settsfadjust(sc->sc_ah, sc->sc_stagbeacons); - SET_NETDEV_DEV(dev, ATH_GET_NETDEV_DEV(mdev)); +#ifdef ATH_PCI + SET_NETDEV_DEV(dev, &((struct pci_dev *)sc->sc_bdev)->dev); +#endif /* complete setup */ (void) ieee80211_vap_attach(vap, ieee80211_media_change, ieee80211_media_status); Modified: madwifi/branches/madwifi-0.9.4/ath/if_athvar.h =================================================================== --- madwifi/branches/madwifi-0.9.4/ath/if_athvar.h 2011-10-07 21:30:59 UTC (rev 4170) +++ madwifi/branches/madwifi-0.9.4/ath/if_athvar.h 2011-10-07 21:31:51 UTC (rev 4171) @@ -116,12 +116,6 @@ #define SET_NETDEV_DEV(ndev, pdev) #endif -#ifdef to_net_dev -#define ATH_GET_NETDEV_DEV(ndev) ((ndev)->dev.parent) -#else -#define ATH_GET_NETDEV_DEV(ndev) ((ndev)->class_dev.dev) -#endif - #ifndef NETDEV_TX_OK #define NETDEV_TX_OK 0 #define NETDEV_TX_BUSY 1 |
From: Pavel R. <svn...@ma...> - 2011-10-07 21:31:14
|
Project : madwifi Revision : 4170 Author : proski (Pavel Roskin) Date : 2011-10-07 23:30:59 +0200 (Fri, 07 Oct 2011) Log Message : Eliminate ATH_GET_NETDEV_DEV, it breaks on some CentOS kernels Instead, use sc->sc_bdev to find the physical device. sc->sc_bdev is NULL on AHB and we don't use SET_NETDEV_DEV on AHB anyway, so do it on PCI only. Affected Files: * madwifi/trunk/ath/if_ath.c updated * madwifi/trunk/ath/if_athvar.h updated Modified: madwifi/trunk/ath/if_ath.c =================================================================== --- madwifi/trunk/ath/if_ath.c 2011-10-07 21:16:17 UTC (rev 4169) +++ madwifi/trunk/ath/if_ath.c 2011-10-07 21:30:59 UTC (rev 4170) @@ -1493,7 +1493,9 @@ } if (sc->sc_hastsfadd) ath_hal_settsfadjust(sc->sc_ah, sc->sc_stagbeacons); - SET_NETDEV_DEV(dev, ATH_GET_NETDEV_DEV(mdev)); +#ifdef ATH_PCI + SET_NETDEV_DEV(dev, &((struct pci_dev *)sc->sc_bdev)->dev); +#endif /* complete setup */ (void) ieee80211_vap_attach(vap, ieee80211_media_change, ieee80211_media_status); Modified: madwifi/trunk/ath/if_athvar.h =================================================================== --- madwifi/trunk/ath/if_athvar.h 2011-10-07 21:16:17 UTC (rev 4169) +++ madwifi/trunk/ath/if_athvar.h 2011-10-07 21:30:59 UTC (rev 4170) @@ -125,12 +125,6 @@ #define SET_NETDEV_DEV(ndev, pdev) #endif -#ifdef to_net_dev -#define ATH_GET_NETDEV_DEV(ndev) ((ndev)->dev.parent) -#else -#define ATH_GET_NETDEV_DEV(ndev) ((ndev)->class_dev.dev) -#endif - #if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,23) static inline struct net_device *_alloc_netdev(int sizeof_priv, const char *mask, void (*setup)(struct net_device *)) |
From: Pavel R. <svn...@ma...> - 2011-10-07 21:16:36
|
Project : madwifi Revision : 4169 Author : proski (Pavel Roskin) Date : 2011-10-07 23:16:17 +0200 (Fri, 07 Oct 2011) Log Message : Don't redefine netdev_for_each_mc_addr() It's already defined in CentOS 2.6.18-238.19.1.el5 kernel. Use parentheses around dev to be safer. Affected Files: * madwifi/branches/madwifi-0.9.4/include/compat.h updated Modified: madwifi/branches/madwifi-0.9.4/include/compat.h =================================================================== --- madwifi/branches/madwifi-0.9.4/include/compat.h 2011-10-07 21:14:47 UTC (rev 4168) +++ madwifi/branches/madwifi-0.9.4/include/compat.h 2011-10-07 21:16:17 UTC (rev 4169) @@ -66,9 +66,11 @@ #endif #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,34) +#ifndef netdev_for_each_mc_addr #define netdev_for_each_mc_addr(mclist, dev) \ - for (mclist = dev->mc_list; mclist; mclist = mclist->next) + for (mclist = (dev)->mc_list; mclist; mclist = mclist->next) #endif +#endif #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,35) #define ath_netdev_hw_addr dev_mc_list |
From: Pavel R. <svn...@ma...> - 2011-10-07 21:15:05
|
Project : madwifi Revision : 4168 Author : proski (Pavel Roskin) Date : 2011-10-07 23:14:47 +0200 (Fri, 07 Oct 2011) Log Message : Don't redefine netdev_for_each_mc_addr() It's already defined in CentOS 2.6.18-238.19.1.el5 kernel. Use parentheses around dev to be safer. Affected Files: * madwifi/trunk/include/compat.h updated Modified: madwifi/trunk/include/compat.h =================================================================== --- madwifi/trunk/include/compat.h 2011-08-26 15:38:40 UTC (rev 4167) +++ madwifi/trunk/include/compat.h 2011-10-07 21:14:47 UTC (rev 4168) @@ -78,9 +78,11 @@ #endif #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,34) +#ifndef netdev_for_each_mc_addr #define netdev_for_each_mc_addr(mclist, dev) \ - for (mclist = dev->mc_list; mclist; mclist = mclist->next) + for (mclist = (dev)->mc_list; mclist; mclist = mclist->next) #endif +#endif #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,35) #define ath_netdev_hw_addr dev_mc_list |
From: Pavel R. <svn...@ma...> - 2011-08-26 15:38:57
|
Project : madwifi Revision : 4167 Author : proski (Pavel Roskin) Date : 2011-08-26 17:38:40 +0200 (Fri, 26 Aug 2011) Log Message : Fix typos found by codespell Affected Files: * madwifi/branches/madwifi-0.9.4/ath/if_ath.c updated * madwifi/branches/madwifi-0.9.4/ath_rate/minstrel/minstrel.c updated * madwifi/branches/madwifi-0.9.4/include/compat.h updated * madwifi/branches/madwifi-0.9.4/net80211/ieee80211.c updated * madwifi/branches/madwifi-0.9.4/net80211/ieee80211_input.c updated * madwifi/branches/madwifi-0.9.4/net80211/ieee80211_node.c updated * madwifi/branches/madwifi-0.9.4/net80211/ieee80211_wireless.c updated * madwifi/branches/madwifi-0.9.4/tools/wireless_copy.h updated Modified: madwifi/branches/madwifi-0.9.4/ath/if_ath.c =================================================================== --- madwifi/branches/madwifi-0.9.4/ath/if_ath.c 2011-08-26 15:31:01 UTC (rev 4166) +++ madwifi/branches/madwifi-0.9.4/ath/if_ath.c 2011-08-26 15:38:40 UTC (rev 4167) @@ -1861,7 +1861,7 @@ struct ath_softc *sc = netdev_priv(dev); if (time_before(jiffies, sc->sc_ic.ic_bmiss_guard)) { - /* Beacon miss interrupt occured too short after last beacon + /* Beacon miss interrupt occurred too short after last beacon * timer configuration. Ignore it as it could be spurious. */ DPRINTF(sc, ATH_DEBUG_ANY, "%s: ignored\n", __func__); } else { Modified: madwifi/branches/madwifi-0.9.4/ath_rate/minstrel/minstrel.c =================================================================== --- madwifi/branches/madwifi-0.9.4/ath_rate/minstrel/minstrel.c 2011-08-26 15:31:01 UTC (rev 4166) +++ madwifi/branches/madwifi-0.9.4/ath_rate/minstrel/minstrel.c 2011-08-26 15:38:40 UTC (rev 4167) @@ -61,7 +61,7 @@ * * It is not an aimless search, there is some direction to the search * pattern. But then, the minstels of old only sung where they thought - * they would get an income. Similarily, we direct thesearch a little. + * they would get an income. Similarly, we direct the search a little. * * Enjoy. Derek Smithies. */ Modified: madwifi/branches/madwifi-0.9.4/include/compat.h =================================================================== --- madwifi/branches/madwifi-0.9.4/include/compat.h 2011-08-26 15:31:01 UTC (rev 4166) +++ madwifi/branches/madwifi-0.9.4/include/compat.h 2011-08-26 15:38:40 UTC (rev 4167) @@ -80,7 +80,7 @@ /* * BSD/Linux compatibility shims. These are used mainly to - * minimize differences when importing necesary BSD code. + * minimize differences when importing necessary BSD code. */ #define NBBY 8 /* number of bits/byte */ Modified: madwifi/branches/madwifi-0.9.4/net80211/ieee80211.c =================================================================== --- madwifi/branches/madwifi-0.9.4/net80211/ieee80211.c 2011-08-26 15:31:01 UTC (rev 4166) +++ madwifi/branches/madwifi-0.9.4/net80211/ieee80211.c 2011-08-26 15:38:40 UTC (rev 4167) @@ -1589,7 +1589,7 @@ * NB: this is not quite right, since we should have one of: * 'I' indoor only * 'O' outdoor only - * ' ' all enviroments + * ' ' all environments * we currently can only provide 'I' or ' '. */ ic->ic_country_ie.country_str[2] = 'I'; Modified: madwifi/branches/madwifi-0.9.4/net80211/ieee80211_input.c =================================================================== --- madwifi/branches/madwifi-0.9.4/net80211/ieee80211_input.c 2011-08-26 15:31:01 UTC (rev 4166) +++ madwifi/branches/madwifi-0.9.4/net80211/ieee80211_input.c 2011-08-26 15:38:40 UTC (rev 4167) @@ -1015,7 +1015,7 @@ if (more_frag) { if (skb_is_nonlinear(skb)) { /* - * We need a continous buffer to + * We need a continuous buffer to * assemble fragments */ ni->ni_rxfrag = skb_copy(skb, GFP_ATOMIC); @@ -2311,7 +2311,7 @@ netif_stop_queue(ic->ic_dev); #endif - vap->iv_csa_jiffies = 0; /* supress "cancel" msg */ + vap->iv_csa_jiffies = 0; /* suppress "cancel" msg */ ieee80211_doth_cancel_cs(vap); ic->ic_prevchan = ic->ic_curchan; Modified: madwifi/branches/madwifi-0.9.4/net80211/ieee80211_node.c =================================================================== --- madwifi/branches/madwifi-0.9.4/net80211/ieee80211_node.c 2011-08-26 15:31:01 UTC (rev 4166) +++ madwifi/branches/madwifi-0.9.4/net80211/ieee80211_node.c 2011-08-26 15:38:40 UTC (rev 4167) @@ -370,7 +370,7 @@ ieee80211_reset_erp(ic, ic->ic_curmode); ni = ieee80211_alloc_node(&ic->ic_sta, vap, vap->iv_myaddr); - KASSERT(ni != NULL, ("unable to setup inital BSS node")); + KASSERT(ni != NULL, ("unable to setup initial BSS node")); obss = vap->iv_bss; vap->iv_bss = ieee80211_ref_node(ni); Modified: madwifi/branches/madwifi-0.9.4/net80211/ieee80211_wireless.c =================================================================== --- madwifi/branches/madwifi-0.9.4/net80211/ieee80211_wireless.c 2011-08-26 15:31:01 UTC (rev 4166) +++ madwifi/branches/madwifi-0.9.4/net80211/ieee80211_wireless.c 2011-08-26 15:38:40 UTC (rev 4167) @@ -953,7 +953,7 @@ } /* Atheros' RSSI value is SNR: 0 -> 60 for old chipsets. Range - * for newer chipsets is unknown. This value is arbitarily chosen + * for newer chipsets is unknown. This value is arbitrarily chosen * to give an indication that full rate will be available and to be * a practicable maximum. */ range->max_qual.qual = 70; @@ -2003,7 +2003,7 @@ strcat(name, "-xr"); /* * create a new XR vap. if the normal VAP is already up, - * bring up the XR vap aswell. + * bring up the XR vap as well. */ vap->iv_ath_cap &= ~IEEE80211_ATHC_TURBOP; /* turn off turbo */ ieee80211_scan_flush(ic); /* NB: could optimize */ Modified: madwifi/branches/madwifi-0.9.4/tools/wireless_copy.h =================================================================== --- madwifi/branches/madwifi-0.9.4/tools/wireless_copy.h 2011-08-26 15:31:01 UTC (rev 4166) +++ madwifi/branches/madwifi-0.9.4/tools/wireless_copy.h 2011-08-26 15:38:40 UTC (rev 4167) @@ -1065,7 +1065,7 @@ */ struct iw_event { - __u16 len; /* Real lenght of this stuff */ + __u16 len; /* Real length of this stuff */ __u16 cmd; /* Wireless IOCTL */ union iwreq_data u; /* IOCTL fixed payload */ }; |
From: Pavel R. <svn...@ma...> - 2011-08-26 15:31:18
|
Project : madwifi Revision : 4166 Author : proski (Pavel Roskin) Date : 2011-08-26 17:31:01 +0200 (Fri, 26 Aug 2011) Log Message : Fix typos found by codespell Affected Files: * madwifi/trunk/ath/if_ath.c updated * madwifi/trunk/ath/if_ath_hal_extensions.c updated * madwifi/trunk/ath/if_athvar.h updated * madwifi/trunk/ath_hal/ah.c updated * madwifi/trunk/ath_hal/ah_regdomain.c updated * madwifi/trunk/ath_hal/ar5211/ar5211_reset.c updated * madwifi/trunk/ath_hal/ar5212/ar2316.c updated * madwifi/trunk/ath_hal/ar5212/ar2317.c updated * madwifi/trunk/ath_hal/ar5212/ar2413.c updated * madwifi/trunk/ath_hal/ar5212/ar2425.c updated * madwifi/trunk/ath_hal/ar5212/ar5212_attach.c updated * madwifi/trunk/ath_hal/ar5212/ar5212_power.c updated * madwifi/trunk/ath_hal/ar5212/ar5212_reset.c updated * madwifi/trunk/ath_hal/ar5212/ar5413.c updated * madwifi/trunk/ath_hal/ar5416/ar5416_cal.c updated * madwifi/trunk/ath_hal/ar5416/ar5416_xmit.c updated * madwifi/trunk/ath_hal/ar5416/ar5416reg.h updated * madwifi/trunk/ath_rate/minstrel/minstrel.c updated * madwifi/trunk/include/compat.h updated * madwifi/trunk/net80211/ieee80211.c updated * madwifi/trunk/net80211/ieee80211_input.c updated * madwifi/trunk/net80211/ieee80211_linux.c updated * madwifi/trunk/net80211/ieee80211_node.c updated * madwifi/trunk/net80211/ieee80211_node.h updated * madwifi/trunk/net80211/ieee80211_var.h updated * madwifi/trunk/net80211/ieee80211_wireless.c updated * madwifi/trunk/tools/wireless_copy.h updated Modified: madwifi/trunk/ath/if_ath.c =================================================================== --- madwifi/trunk/ath/if_ath.c 2011-08-15 19:10:12 UTC (rev 4165) +++ madwifi/trunk/ath/if_ath.c 2011-08-26 15:31:01 UTC (rev 4166) @@ -2677,7 +2677,7 @@ struct ath_softc *sc = netdev_priv(dev); if (time_before(jiffies, sc->sc_ic.ic_bmiss_guard)) { - /* Beacon miss interrupt occured too short after last beacon + /* Beacon miss interrupt occurred too short after last beacon * timer configuration. Ignore it as it could be spurious. */ DPRINTF(sc, ATH_DEBUG_ANY, "Beacon miss ignored\n"); } else { @@ -10821,7 +10821,7 @@ * being very careful or taking something into account that I can't * find in the specs. * - * XXX: Update based on emperical evidence (potentially save 15us per + * XXX: Update based on empirical evidence (potentially save 15us per * timeout). */ return ath_slottime2timeout(sc, ath_distance2slottime(sc, distance)); } Modified: madwifi/trunk/ath/if_ath_hal_extensions.c =================================================================== --- madwifi/trunk/ath/if_ath_hal_extensions.c 2011-08-15 19:10:12 UTC (rev 4165) +++ madwifi/trunk/ath/if_ath_hal_extensions.c 2011-08-26 15:31:01 UTC (rev 4166) @@ -165,7 +165,7 @@ * of beacon timer configuration (which we try to avoid) and due to unlucky * timing of local TSF updates (triggered by the reception of a beacon with the * same BSSID - something we can't avoid) the beacon timers can be up updated - * seperately, leaving one of them in the past, not beeing updated until the + * separately, leaving one of them in the past, not beeing updated until the * timers wrap around. due to the fact that the beacon interval does not fit * into the timer period (16 bit) a whole number of times the size of the ATIM * window can get bigger than desired. Modified: madwifi/trunk/ath/if_athvar.h =================================================================== --- madwifi/trunk/ath/if_athvar.h 2011-08-15 19:10:12 UTC (rev 4165) +++ madwifi/trunk/ath/if_athvar.h 2011-08-26 15:31:01 UTC (rev 4166) @@ -701,7 +701,7 @@ unsigned int sc_useintmit:1; /* Interference mitigation enabled? */ unsigned int sc_txcont:1; /* Is continuous transmit enabled? */ unsigned int sc_dfs_testmode:1; /* IF this is on, AP vaps will stay in - * 'channel availability check' indefinately, + * 'channel availability check' indefinitely, * reporting radar and interference detections. */ unsigned int sc_dmasize_stomp:1; /* Whether to stomp on DMA size. */ Modified: madwifi/trunk/ath_hal/ah.c =================================================================== --- madwifi/trunk/ath_hal/ah.c 2011-08-15 19:10:12 UTC (rev 4165) +++ madwifi/trunk/ath_hal/ah.c 2011-08-26 15:31:01 UTC (rev 4166) @@ -151,7 +151,7 @@ kbps = rates->info[rateix].rateKbps; /* - * index can be invalid duting dynamic Turbo transitions. + * index can be invalid during dynamic Turbo transitions. */ if(kbps == 0) return 0; switch (rates->info[rateix].phy) { Modified: madwifi/trunk/ath_hal/ah_regdomain.c =================================================================== --- madwifi/trunk/ath_hal/ah_regdomain.c 2011-08-15 19:10:12 UTC (rev 4165) +++ madwifi/trunk/ath_hal/ah_regdomain.c 2011-08-26 15:31:01 UTC (rev 4166) @@ -2361,7 +2361,7 @@ return (bitmask[byteOffset] & val) != 0; } -/* Add given regclassid into regclassids array upto max of maxregids */ +/* Add given regclassid into regclassids array up to max of maxregids */ static void ath_add_regclassid(uint8_t *regclassids, u_int maxregids, u_int *nregids, uint8_t regclassid) Modified: madwifi/trunk/ath_hal/ar5211/ar5211_reset.c =================================================================== --- madwifi/trunk/ath_hal/ar5211/ar5211_reset.c 2011-08-15 19:10:12 UTC (rev 4165) +++ madwifi/trunk/ath_hal/ar5211/ar5211_reset.c 2011-08-26 15:31:01 UTC (rev 4166) @@ -940,7 +940,7 @@ } /* - * Read the NF and check it against the noise floor threshhold + * Read the NF and check it against the noise floor threshold * * Returns: TRUE if the NF is good */ Modified: madwifi/trunk/ath_hal/ar5212/ar2316.c =================================================================== --- madwifi/trunk/ath_hal/ar5212/ar2316.c 2011-08-15 19:10:12 UTC (rev 4165) +++ madwifi/trunk/ath_hal/ar5212/ar2316.c 2011-08-26 15:31:01 UTC (rev 4166) @@ -381,9 +381,9 @@ * change pwr_I_0 to signed 5-bits. */ int16_t Pmin_t2[MAX_NUM_PDGAINS_PER_CHANNEL]; - /* to accomodate -ve power levels later on. */ + /* to accommodate -ve power levels later on. */ int16_t Pmax_t2[MAX_NUM_PDGAINS_PER_CHANNEL]; - /* to accomodate -ve power levels later on */ + /* to accommodate -ve power levels later on */ uint16_t numVpd = 0; uint16_t Vpd_step; int16_t tmpVal ; Modified: madwifi/trunk/ath_hal/ar5212/ar2317.c =================================================================== --- madwifi/trunk/ath_hal/ar5212/ar2317.c 2011-08-15 19:10:12 UTC (rev 4165) +++ madwifi/trunk/ath_hal/ar5212/ar2317.c 2011-08-26 15:31:01 UTC (rev 4166) @@ -358,9 +358,9 @@ * change pwr_I_0 to signed 5-bits. */ int16_t Pmin_t2[MAX_NUM_PDGAINS_PER_CHANNEL]; - /* to accomodate -ve power levels later on. */ + /* to accommodate -ve power levels later on. */ int16_t Pmax_t2[MAX_NUM_PDGAINS_PER_CHANNEL]; - /* to accomodate -ve power levels later on */ + /* to accommodate -ve power levels later on */ uint16_t numVpd = 0; uint16_t Vpd_step; int16_t tmpVal ; Modified: madwifi/trunk/ath_hal/ar5212/ar2413.c =================================================================== --- madwifi/trunk/ath_hal/ar5212/ar2413.c 2011-08-15 19:10:12 UTC (rev 4165) +++ madwifi/trunk/ath_hal/ar5212/ar2413.c 2011-08-26 15:31:01 UTC (rev 4166) @@ -375,9 +375,9 @@ * change pwr_I_0 to signed 5-bits. */ int16_t Pmin_t2[MAX_NUM_PDGAINS_PER_CHANNEL]; - /* to accomodate -ve power levels later on. */ + /* to accommodate -ve power levels later on. */ int16_t Pmax_t2[MAX_NUM_PDGAINS_PER_CHANNEL]; - /* to accomodate -ve power levels later on */ + /* to accommodate -ve power levels later on */ uint16_t numVpd = 0; uint16_t Vpd_step; int16_t tmpVal ; Modified: madwifi/trunk/ath_hal/ar5212/ar2425.c =================================================================== --- madwifi/trunk/ath_hal/ar5212/ar2425.c 2011-08-15 19:10:12 UTC (rev 4165) +++ madwifi/trunk/ath_hal/ar5212/ar2425.c 2011-08-26 15:31:01 UTC (rev 4166) @@ -380,9 +380,9 @@ * change pwr_I_0 to signed 5-bits. */ static int16_t Pmin_t2[MAX_NUM_PDGAINS_PER_CHANNEL]; - /* to accomodate -ve power levels later on. */ + /* to accommodate -ve power levels later on. */ static int16_t Pmax_t2[MAX_NUM_PDGAINS_PER_CHANNEL]; - /* to accomodate -ve power levels later on */ + /* to accommodate -ve power levels later on */ uint16_t numVpd = 0; uint16_t Vpd_step; int16_t tmpVal ; Modified: madwifi/trunk/ath_hal/ar5212/ar5212_attach.c =================================================================== --- madwifi/trunk/ath_hal/ar5212/ar5212_attach.c 2011-08-15 19:10:12 UTC (rev 4165) +++ madwifi/trunk/ath_hal/ar5212/ar5212_attach.c 2011-08-26 15:31:01 UTC (rev 4166) @@ -836,7 +836,7 @@ pCap->halRfSilentSupport = AH_TRUE; } - /* NB: this is a guess, noone seems to know the answer */ + /* NB: this is a guess, no one seems to know the answer */ ahpriv->ah_rxornIsFatal = (AH_PRIVATE(ah)->ah_macVersion < AR_SREV_VERSION_VENICE); Modified: madwifi/trunk/ath_hal/ar5212/ar5212_power.c =================================================================== --- madwifi/trunk/ath_hal/ar5212/ar5212_power.c 2011-08-15 19:10:12 UTC (rev 4165) +++ madwifi/trunk/ath_hal/ar5212/ar5212_power.c 2011-08-26 15:31:01 UTC (rev 4166) @@ -51,7 +51,7 @@ * which when blindly written back with OS_REG_RMW_FIELD * enables the MIB interrupt for the sleep performance * counters. This can result in an interrupt storm when - * ANI is in operation as noone knows to turn off the MIB + * ANI is in operation as no one knows to turn off the MIB * interrupt cause. */ scr = OS_REG_READ(ah, AR_SCR); Modified: madwifi/trunk/ath_hal/ar5212/ar5212_reset.c =================================================================== --- madwifi/trunk/ath_hal/ar5212/ar5212_reset.c 2011-08-15 19:10:12 UTC (rev 4165) +++ madwifi/trunk/ath_hal/ar5212/ar5212_reset.c 2011-08-26 15:31:01 UTC (rev 4166) @@ -1257,7 +1257,7 @@ } /* - * Read the NF and check it against the noise floor threshhold + * Read the NF and check it against the noise floor threshold */ int16_t ar5212GetNf(struct ath_hal *ah, HAL_CHANNEL_INTERNAL *chan) Modified: madwifi/trunk/ath_hal/ar5212/ar5413.c =================================================================== --- madwifi/trunk/ath_hal/ar5212/ar5413.c 2011-08-15 19:10:12 UTC (rev 4165) +++ madwifi/trunk/ath_hal/ar5212/ar5413.c 2011-08-26 15:31:01 UTC (rev 4166) @@ -411,9 +411,9 @@ * change pwr_I_0 to signed 5-bits. */ int16_t Pmin_t2[MAX_NUM_PDGAINS_PER_CHANNEL]; - /* to accomodate -ve power levels later on. */ + /* to accommodate -ve power levels later on. */ int16_t Pmax_t2[MAX_NUM_PDGAINS_PER_CHANNEL]; - /* to accomodate -ve power levels later on */ + /* to accommodate -ve power levels later on */ uint16_t numVpd = 0; uint16_t Vpd_step; int16_t tmpVal ; Modified: madwifi/trunk/ath_hal/ar5416/ar5416_cal.c =================================================================== --- madwifi/trunk/ath_hal/ar5416/ar5416_cal.c 2011-08-15 19:10:12 UTC (rev 4165) +++ madwifi/trunk/ath_hal/ar5416/ar5416_cal.c 2011-08-26 15:31:01 UTC (rev 4166) @@ -621,7 +621,7 @@ } /* - * Read the NF and check it against the noise floor threshhold + * Read the NF and check it against the noise floor threshold */ static int16_t ar5416GetNf(struct ath_hal *ah, HAL_CHANNEL_INTERNAL *chan) Modified: madwifi/trunk/ath_hal/ar5416/ar5416_xmit.c =================================================================== --- madwifi/trunk/ath_hal/ar5416/ar5416_xmit.c 2011-08-15 19:10:12 UTC (rev 4165) +++ madwifi/trunk/ath_hal/ar5416/ar5416_xmit.c 2011-08-26 15:31:01 UTC (rev 4166) @@ -563,7 +563,7 @@ } /* - * These fields are not used. Zero these to preserve compatability + * These fields are not used. Zero these to preserve compatibility * with existing drivers. */ ts->ts_virtcol = MS(ads->ds_ctl1, AR_VirtRetryCnt); Modified: madwifi/trunk/ath_hal/ar5416/ar5416reg.h =================================================================== --- madwifi/trunk/ath_hal/ar5416/ar5416reg.h 2011-08-15 19:10:12 UTC (rev 4165) +++ madwifi/trunk/ath_hal/ar5416/ar5416reg.h 2011-08-26 15:31:01 UTC (rev 4166) @@ -192,10 +192,10 @@ #define AR_PCIE_PM_CTRL_ENA 0x00080000 #define AR_AHB_EXACT_WR_EN 0x00000000 /* write exact bytes */ -#define AR_AHB_BUF_WR_EN 0x00000001 /* buffer write upto cacheline*/ +#define AR_AHB_BUF_WR_EN 0x00000001 /* buffer write up to cacheline*/ #define AR_AHB_EXACT_RD_EN 0x00000000 /* read exact bytes */ -#define AR_AHB_CACHELINE_RD_EN 0x00000002 /* read upto end of cacheline */ -#define AR_AHB_PREFETCH_RD_EN 0x00000004 /* prefetch upto page boundary*/ +#define AR_AHB_CACHELINE_RD_EN 0x00000002 /* read up to end of cacheline */ +#define AR_AHB_PREFETCH_RD_EN 0x00000004 /* prefetch up to page boundary*/ #define AR_AHB_PAGE_SIZE_1K 0x00000000 /* set page-size as 1k */ #define AR_AHB_PAGE_SIZE_2K 0x00000008 /* set page-size as 2k */ #define AR_AHB_PAGE_SIZE_4K 0x00000010 /* set page-size as 4k */ @@ -416,7 +416,7 @@ #define AR_PCU_MISS_BCN_IN_SLEEP 0x00004000 /* count bmiss's when sleeping */ #define AR_PCU_BUG_12306_FIX_ENA 0x00020000 /* use rx_clear to count sifs */ #define AR_PCU_FORCE_QUIET_COLL 0x00040000 /* kill xmit for channel change */ -#define AR_PCU_TBTT_PROTECT 0x00200000 /* no xmit upto tbtt+20 uS */ +#define AR_PCU_TBTT_PROTECT 0x00200000 /* no xmit up to tbtt+20 uS */ #define AR_PCU_CLEAR_VMF 0x01000000 /* clear vmf mode (fast cc)*/ #define AR_PCU_CLEAR_BA_VALID 0x04000000 /* clear ba state */ Modified: madwifi/trunk/ath_rate/minstrel/minstrel.c =================================================================== --- madwifi/trunk/ath_rate/minstrel/minstrel.c 2011-08-15 19:10:12 UTC (rev 4165) +++ madwifi/trunk/ath_rate/minstrel/minstrel.c 2011-08-26 15:31:01 UTC (rev 4166) @@ -61,7 +61,7 @@ * * It is not an aimless search, there is some direction to the search * pattern. But then, the minstels of old only sung where they thought - * they would get an income. Similarily, we direct thesearch a little. + * they would get an income. Similarly, we direct the search a little. * * Enjoy. Derek Smithies. */ Modified: madwifi/trunk/include/compat.h =================================================================== --- madwifi/trunk/include/compat.h 2011-08-15 19:10:12 UTC (rev 4165) +++ madwifi/trunk/include/compat.h 2011-08-26 15:31:01 UTC (rev 4166) @@ -92,7 +92,7 @@ /* * BSD/Linux compatibility shims. These are used mainly to - * minimize differences when importing necesary BSD code. + * minimize differences when importing necessary BSD code. */ #define NBBY 8 /* number of bits/byte */ Modified: madwifi/trunk/net80211/ieee80211.c =================================================================== --- madwifi/trunk/net80211/ieee80211.c 2011-08-15 19:10:12 UTC (rev 4165) +++ madwifi/trunk/net80211/ieee80211.c 2011-08-26 15:31:01 UTC (rev 4166) @@ -1847,7 +1847,7 @@ * NB: this is not quite right, since we should have one of: * 'I': indoor only * 'O': outdoor only - * ' ': all enviroments + * ' ': all environments * we currently can only provide 'I' or ' '. */ ic->ic_country_ie.country_str[2] = 'I'; Modified: madwifi/trunk/net80211/ieee80211_input.c =================================================================== --- madwifi/trunk/net80211/ieee80211_input.c 2011-08-15 19:10:12 UTC (rev 4165) +++ madwifi/trunk/net80211/ieee80211_input.c 2011-08-26 15:31:01 UTC (rev 4166) @@ -393,7 +393,7 @@ /* since ieee80211_input() can be called multiple times for * flooding VAPs when we don't know which VAP needs the packet - * we don't want to update the wrong state when ni is assigned - * to the bss node to accomodate this case. */ + * to the bss node to accommodate this case. */ if (IEEE80211_ADDR_EQ(wh->i_addr2, ni->ni_macaddr)) { ni->ni_rssi = rssi; ni->ni_rtsf = rtsf; @@ -1051,7 +1051,7 @@ if (more_frag) { if (skb_is_nonlinear(skb)) { /* - * We need a continous buffer to + * We need a continuous buffer to * assemble fragments */ ni->ni_rxfrag = skb_copy(skb, GFP_ATOMIC); Modified: madwifi/trunk/net80211/ieee80211_linux.c =================================================================== --- madwifi/trunk/net80211/ieee80211_linux.c 2011-08-15 19:10:12 UTC (rev 4165) +++ madwifi/trunk/net80211/ieee80211_linux.c 2011-08-26 15:31:01 UTC (rev 4166) @@ -99,7 +99,7 @@ }; static struct attribute_group ieee80211_attr_grp = { - .name = NULL, /* No seperate (sub-)directory */ + .name = NULL, /* No separate (sub-)directory */ .attrs = ieee80211_sysfs_attrs }; #endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,17) */ Modified: madwifi/trunk/net80211/ieee80211_node.c =================================================================== --- madwifi/trunk/net80211/ieee80211_node.c 2011-08-15 19:10:12 UTC (rev 4165) +++ madwifi/trunk/net80211/ieee80211_node.c 2011-08-26 15:31:01 UTC (rev 4166) @@ -374,7 +374,7 @@ IEEE80211_DPRINTF(vap, IEEE80211_MSG_ASSOC, "%s: ni:%p allocated for " MAC_FMT "\n", __func__, ni, MAC_ADDR(vap->iv_myaddr)); - KASSERT(ni != NULL, ("unable to setup inital BSS node")); + KASSERT(ni != NULL, ("unable to setup initial BSS node")); vap->iv_bss = PASS_NODE(ni); KASSERT((atomic_read(&vap->iv_bss->ni_refcnt) == 2), Modified: madwifi/trunk/net80211/ieee80211_node.h =================================================================== --- madwifi/trunk/net80211/ieee80211_node.h 2011-08-15 19:10:12 UTC (rev 4165) +++ madwifi/trunk/net80211/ieee80211_node.h 2011-08-26 15:31:01 UTC (rev 4166) @@ -279,7 +279,7 @@ /* Reference counting only needs to be locked out against the transitions, * 0->1 and 1->0 (i.e., when we do not own the reference we are getting). * This only happens when finding the a node reference from the node table, - * which is locked seperately. Thus, we do not need to lock the follwoing + * which is locked separately. Thus, we do not need to lock the following * functions. * Increment the reference counter for ieee80211_node *. */ struct ieee80211_node *ieee80211_ref_node(struct ieee80211_node *ni); Modified: madwifi/trunk/net80211/ieee80211_var.h =================================================================== --- madwifi/trunk/net80211/ieee80211_var.h 2011-08-15 19:10:12 UTC (rev 4165) +++ madwifi/trunk/net80211/ieee80211_var.h 2011-08-26 15:31:01 UTC (rev 4166) @@ -76,7 +76,7 @@ * This is halfway between the 10@100ms default from prior hardcoded setting for * software beacon miss timers, and the 7@100ms default from prior hardcoded * timer value for hardware beacon miss timer. - * Based upon emperical evidence and practices of commercial vendors, I believe + * Based upon empirical evidence and practices of commercial vendors, I believe * this should really be 2500ms by default. */ #define IEEE80211_BMISSTHRESH_DEFAULT_MS 850 Modified: madwifi/trunk/net80211/ieee80211_wireless.c =================================================================== --- madwifi/trunk/net80211/ieee80211_wireless.c 2011-08-15 19:10:12 UTC (rev 4165) +++ madwifi/trunk/net80211/ieee80211_wireless.c 2011-08-26 15:31:01 UTC (rev 4166) @@ -983,7 +983,7 @@ } /* Atheros' RSSI value is SNR: 0 -> 60 for old chipsets. Range - * for newer chipsets is unknown. This value is arbitarily chosen + * for newer chipsets is unknown. This value is arbitrarily chosen * to give an indication that full rate will be available and to be * a practicable maximum. */ range->max_qual.qual = 70; @@ -2186,7 +2186,7 @@ strcat(name, "-xr"); /* * Create a new XR vap. If the normal VAP is already up, - * bring up the XR vap aswell. + * bring up the XR vap as well. */ vap->iv_ath_cap &= ~IEEE80211_ATHC_TURBOP; /* turn off turbo */ ieee80211_scan_flush(ic); /* NB: could optimize */ Modified: madwifi/trunk/tools/wireless_copy.h =================================================================== --- madwifi/trunk/tools/wireless_copy.h 2011-08-15 19:10:12 UTC (rev 4165) +++ madwifi/trunk/tools/wireless_copy.h 2011-08-26 15:31:01 UTC (rev 4166) @@ -1065,7 +1065,7 @@ */ struct iw_event { - __u16 len; /* Real lenght of this stuff */ + __u16 len; /* Real length of this stuff */ __u16 cmd; /* Wireless IOCTL */ union iwreq_data u; /* IOCTL fixed payload */ }; |
From: Pavel R. <svn...@ma...> - 2011-08-15 19:10:27
|
Project : madwifi Revision : 4165 Author : proski (Pavel Roskin) Date : 2011-08-15 21:10:12 +0200 (Mon, 15 Aug 2011) Log Message : Fix compilation on Linux 3.1 broken by VLAN API changes Don't define IEEE80211_VLAN_TAG_USED on Linux 3.1 and newer. Don't use vlan_hwaccel_rx() if IEEE80211_VLAN_TAG_USED is not 1. Affected Files: * madwifi/branches/madwifi-0.9.4/net80211/ieee80211_input.c updated * madwifi/branches/madwifi-0.9.4/net80211/ieee80211_linux.h updated Modified: madwifi/branches/madwifi-0.9.4/net80211/ieee80211_input.c =================================================================== --- madwifi/branches/madwifi-0.9.4/net80211/ieee80211_input.c 2011-08-15 18:59:53 UTC (rev 4164) +++ madwifi/branches/madwifi-0.9.4/net80211/ieee80211_input.c 2011-08-15 19:10:12 UTC (rev 4165) @@ -1133,10 +1133,12 @@ #else skb->protocol = eth_type_trans(skb, dev); #endif +#if IEEE80211_VLAN_TAG_USED if (ni->ni_vlan != 0 && vap->iv_vlgrp != NULL) { /* attach vlan tag */ vlan_hwaccel_receive_skb(skb, vap->iv_vlgrp, ni->ni_vlan); } else +#endif netif_rx(skb); dev->last_rx = jiffies; } Modified: madwifi/branches/madwifi-0.9.4/net80211/ieee80211_linux.h =================================================================== --- madwifi/branches/madwifi-0.9.4/net80211/ieee80211_linux.h 2011-08-15 18:59:53 UTC (rev 4164) +++ madwifi/branches/madwifi-0.9.4/net80211/ieee80211_linux.h 2011-08-15 19:10:12 UTC (rev 4165) @@ -534,7 +534,8 @@ char *); void ieee80211_proc_cleanup(struct ieee80211vap *); -#if defined(CONFIG_VLAN_8021Q) || defined(CONFIG_VLAN_8021Q_MODULE) +#if LINUX_VERSION_CODE < KERNEL_VERSION(3,1,0) && \ + (defined(CONFIG_VLAN_8021Q) || defined(CONFIG_VLAN_8021Q_MODULE)) #define IEEE80211_VLAN_TAG_USED 1 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,20) |
From: Pavel R. <svn...@ma...> - 2011-08-15 19:00:09
|
Project : madwifi Revision : 4164 Author : proski (Pavel Roskin) Date : 2011-08-15 20:59:53 +0200 (Mon, 15 Aug 2011) Log Message : Fix compilation with IEEE80211_DEBUG_REFCNT=1 Affected Files: * madwifi/trunk/ath/if_ath.c updated * madwifi/trunk/net80211/ieee80211_linux.c updated * madwifi/trunk/net80211/ieee80211_skb.c updated Modified: madwifi/trunk/ath/if_ath.c =================================================================== --- madwifi/trunk/ath/if_ath.c 2011-08-15 18:59:22 UTC (rev 4163) +++ madwifi/trunk/ath/if_ath.c 2011-08-15 18:59:53 UTC (rev 4164) @@ -12389,7 +12389,7 @@ atomic_dec(&sc->sc_txbuf_counter); #ifdef IEEE80211_DEBUG_REFCNT DPRINTF(sc, ATH_DEBUG_TXBUF, - "[TXBUF=%03d/%03d] returned txbuf %p.\n", + "[TXBUF=%03d/%03d] returned txbuf.\n", ath_get_buffer_count(sc), ATH_TXBUF); #endif /* #ifdef IEEE80211_DEBUG_REFCNT */ if (netif_queue_stopped(sc->sc_dev) && Modified: madwifi/trunk/net80211/ieee80211_linux.c =================================================================== --- madwifi/trunk/net80211/ieee80211_linux.c 2011-08-15 18:59:22 UTC (rev 4163) +++ madwifi/trunk/net80211/ieee80211_linux.c 2011-08-15 18:59:53 UTC (rev 4164) @@ -146,11 +146,7 @@ u_int len; len = roundup(sizeof(struct ieee80211_frame) + pktlen, 4); -#ifdef IEEE80211_DEBUG_REFCNT - skb = ieee80211_dev_alloc_skb_debug(len + align - 1, func, line); -#else skb = ieee80211_dev_alloc_skb(len + align - 1); -#endif if (skb != NULL) { u_int off = ((unsigned long) skb->data) % align; if (off != 0) Modified: madwifi/trunk/net80211/ieee80211_skb.c =================================================================== --- madwifi/trunk/net80211/ieee80211_skb.c 2011-08-15 18:59:22 UTC (rev 4163) +++ madwifi/trunk/net80211/ieee80211_skb.c 2011-08-15 18:59:53 UTC (rev 4164) @@ -273,20 +273,20 @@ { if (NULL == skb) { skb_print_message(0 /* show_counter */, - skb, func2, line2, + skb, func, line, "ERROR: NULL skb received. Skipping."); return NULL; } if (M_FLAG_GET(skb, M_SKB_TRACKED)) { skb_print_message(0 /* show_counter */, - skb, func2, line2, + skb, func, line, "ERROR: Already tracked skb received. Skipping."); dump_stack(); return skb; } if (skb_shared(skb)) { skb_print_message(0 /* show_counter */, - skb, func2, line2, + skb, func, line, "ERROR: Shared skb received. References leaked??"); dump_stack(); } @@ -294,7 +294,7 @@ atomic_inc(&skb_refs_counter); M_FLAG_SET(skb, M_SKB_TRACKED); print_skb_trackchange_message(skb, users_adjustment, - func2, line2, + func, line, " is now ** TRACKED **"); #ifdef IEEE80211_DEBUG_REFCNT_SKBDEST /* Install our debug destructor, chaining to the original... */ @@ -380,7 +380,7 @@ if (skb_shared(skb)) { atomic_dec(&skb_refs_counter); - print_skb_refchange_message(skb, -1, func2, line2); + print_skb_refchange_message(skb, -1, func, line); } else { if (SKB_NI(skb) != NULL) { @@ -674,7 +674,7 @@ const char *func, int line) { /* NOT so fast... */ - unref_skb(skb, UNREF_USE_DEV_KFREE_SKB_ANY, func, line, __func__, __LINE__); + unref_skb(skb, UNREF_USE_DEV_KFREE_SKB_ANY, func, line); } struct sk_buff *skb_unshare_debug(struct sk_buff *skb, gfp_t pri, |
From: Pavel R. <svn...@ma...> - 2011-08-15 18:59:37
|
Project : madwifi Revision : 4163 Author : proski (Pavel Roskin) Date : 2011-08-15 20:59:22 +0200 (Mon, 15 Aug 2011) Log Message : Fix compilation on Linux 3.1 broken by VLAN API changes Don't define IEEE80211_VLAN_TAG_USED on Linux 3.1 and newer. Don't use vlan_hwaccel_rx() if IEEE80211_VLAN_TAG_USED is not 1. Affected Files: * madwifi/trunk/net80211/ieee80211_input.c updated * madwifi/trunk/net80211/ieee80211_linux.h updated * madwifi/trunk/net80211/ieee80211_skb.c updated Modified: madwifi/trunk/net80211/ieee80211_input.c =================================================================== --- madwifi/trunk/net80211/ieee80211_input.c 2011-08-03 06:25:42 UTC (rev 4162) +++ madwifi/trunk/net80211/ieee80211_input.c 2011-08-15 18:59:22 UTC (rev 4163) @@ -1194,11 +1194,13 @@ skb->protocol = eth_type_trans(skb, dev); #endif tni = SKB_NI(skb); +#if IEEE80211_VLAN_TAG_USED if ((ni->ni_vlan != 0) && (vap->iv_vlgrp != NULL)) /* Attach VLAN tag. */ ret = vlan_hwaccel_rx(skb, vap->iv_vlgrp, ni->ni_vlan); else +#endif ret = netif_rx(skb); if (ret == NET_RX_DROP) vap->iv_devstats.rx_dropped++; Modified: madwifi/trunk/net80211/ieee80211_linux.h =================================================================== --- madwifi/trunk/net80211/ieee80211_linux.h 2011-08-03 06:25:42 UTC (rev 4162) +++ madwifi/trunk/net80211/ieee80211_linux.h 2011-08-15 18:59:22 UTC (rev 4163) @@ -615,7 +615,8 @@ char *); void ieee80211_proc_cleanup(struct ieee80211vap *); -#if defined(CONFIG_VLAN_8021Q) || defined(CONFIG_VLAN_8021Q_MODULE) +#if LINUX_VERSION_CODE < KERNEL_VERSION(3,1,0) && \ + (defined(CONFIG_VLAN_8021Q) || defined(CONFIG_VLAN_8021Q_MODULE)) #define IEEE80211_VLAN_TAG_USED 1 #ifndef VLAN_GROUP_ARRAY_PART_LEN Modified: madwifi/trunk/net80211/ieee80211_skb.c =================================================================== --- madwifi/trunk/net80211/ieee80211_skb.c 2011-08-03 06:25:42 UTC (rev 4162) +++ madwifi/trunk/net80211/ieee80211_skb.c 2011-08-15 18:59:22 UTC (rev 4163) @@ -570,6 +570,7 @@ #ifdef IEEE80211_DEBUG_REFCNT +#if IEEE80211_VLAN_TAG_USED int vlan_hwaccel_rx_debug(struct sk_buff *skb, struct vlan_group *grp, unsigned short vlan_tag, const char *func, int line) { @@ -577,6 +578,7 @@ untrack_skb(skb, 0, __func__, __LINE__), grp, vlan_tag); } +#endif int netif_rx_debug(struct sk_buff *skb, const char *func, int line) { return netif_rx(untrack_skb(skb, 0, __func__, __LINE__)); |
From: Pavel R. <svn...@ma...> - 2011-08-03 06:25:57
|
Project : madwifi Revision : 4162 Author : proski (Pavel Roskin) Date : 2011-08-03 08:25:42 +0200 (Wed, 03 Aug 2011) Log Message : Don't use "{ 0 }" to initialize structures, use "{ }" Affected Files: * madwifi/branches/madwifi-0.9.4/ath/if_ath.c updated * madwifi/branches/madwifi-0.9.4/ath/if_ath_pci.c updated * madwifi/branches/madwifi-0.9.4/ath_hal/ah_os.c updated * madwifi/branches/madwifi-0.9.4/ath_rate/amrr/amrr.c updated * madwifi/branches/madwifi-0.9.4/ath_rate/onoe/onoe.c updated * madwifi/branches/madwifi-0.9.4/net80211/ieee80211_linux.c updated Modified: madwifi/branches/madwifi-0.9.4/ath/if_ath.c =================================================================== --- madwifi/branches/madwifi-0.9.4/ath/if_ath.c 2011-08-03 05:43:55 UTC (rev 4161) +++ madwifi/branches/madwifi-0.9.4/ath/if_ath.c 2011-08-03 06:25:42 UTC (rev 4162) @@ -9700,7 +9700,7 @@ .proc_handler = ath_sysctl_halparam, .extra2 = (void *)ATH_INTMIT, }, - { 0 } + { } }; static void @@ -9885,21 +9885,21 @@ .extra2 = &maxint, .proc_handler = proc_dointvec_minmax }, - { 0 } + { } }; static ctl_table ath_ath_table[] = { { ATH_INIT_CTL_NAME(DEV_ATH) .procname = "ath", .mode = 0555, .child = ath_static_sysctls - }, { 0 } + }, { } }; static ctl_table ath_root_table[] = { { ATH_INIT_CTL_NAME(CTL_DEV) .procname = "dev", .mode = 0555, .child = ath_ath_table - }, { 0 } + }, { } }; static struct ctl_table_header *ath_sysctl_header; Modified: madwifi/branches/madwifi-0.9.4/ath/if_ath_pci.c =================================================================== --- madwifi/branches/madwifi-0.9.4/ath/if_ath_pci.c 2011-08-03 05:43:55 UTC (rev 4161) +++ madwifi/branches/madwifi-0.9.4/ath/if_ath_pci.c 2011-08-03 06:25:42 UTC (rev 4162) @@ -112,7 +112,7 @@ { 0x168c, 0x001c, PCI_ANY_ID, PCI_ANY_ID }, /* PCI Express 5424 */ { 0x168c, 0x001d, PCI_ANY_ID, PCI_ANY_ID }, /* PCI Express ??? */ { 0x168c, 0x9013, PCI_ANY_ID, PCI_ANY_ID }, /* sonicwall */ - { 0 } + { } }; static u16 ath_devidmap[][2] = { Modified: madwifi/branches/madwifi-0.9.4/ath_hal/ah_os.c =================================================================== --- madwifi/branches/madwifi-0.9.4/ath_hal/ah_os.c 2011-08-03 05:43:55 UTC (rev 4161) +++ madwifi/branches/madwifi-0.9.4/ath_hal/ah_os.c 2011-08-03 06:25:42 UTC (rev 4162) @@ -486,28 +486,28 @@ .proc_handler = proc_dointvec }, #endif - { 0 } + { } }; static ctl_table ath_hal_table[] = { { ATH_INIT_CTL_NAME(CTL_AUTO) .procname = "hal", .mode = 0555, .child = ath_hal_sysctls - }, { 0 } + }, { } }; static ctl_table ath_ath_table[] = { { ATH_INIT_CTL_NAME(DEV_ATH) .procname = "ath", .mode = 0555, .child = ath_hal_table - }, { 0 } + }, { } }; static ctl_table ath_root_table[] = { { ATH_INIT_CTL_NAME(CTL_DEV) .procname = "dev", .mode = 0555, .child = ath_ath_table - }, { 0 } + }, { } }; static struct ctl_table_header *ath_hal_sysctl_header; Modified: madwifi/branches/madwifi-0.9.4/ath_rate/amrr/amrr.c =================================================================== --- madwifi/branches/madwifi-0.9.4/ath_rate/amrr/amrr.c 2011-08-03 05:43:55 UTC (rev 4161) +++ madwifi/branches/madwifi-0.9.4/ath_rate/amrr/amrr.c 2011-08-03 06:25:42 UTC (rev 4162) @@ -524,28 +524,28 @@ .extra2 = &maxint, .proc_handler = proc_dointvec_minmax }, - { 0 } + { } }; static ctl_table ath_rate_table[] = { { ATH_INIT_CTL_NAME(CTL_AUTO) .procname = "rate", .mode = 0555, .child = ath_rate_static_sysctls - }, { 0 } + }, { } }; static ctl_table ath_ath_table[] = { { ATH_INIT_CTL_NAME(DEV_ATH) .procname = "ath", .mode = 0555, .child = ath_rate_table - }, { 0 } + }, { } }; static ctl_table ath_root_table[] = { { ATH_INIT_CTL_NAME(CTL_DEV) .procname = "dev", .mode = 0555, .child = ath_ath_table - }, { 0 } + }, { } }; static struct ctl_table_header *ath_sysctl_header; Modified: madwifi/branches/madwifi-0.9.4/ath_rate/onoe/onoe.c =================================================================== --- madwifi/branches/madwifi-0.9.4/ath_rate/onoe/onoe.c 2011-08-03 05:43:55 UTC (rev 4161) +++ madwifi/branches/madwifi-0.9.4/ath_rate/onoe/onoe.c 2011-08-03 06:25:42 UTC (rev 4162) @@ -469,28 +469,28 @@ .maxlen = sizeof(ath_rate_raise_threshold), .proc_handler = proc_dointvec }, - { 0 } + { } }; static ctl_table ath_rate_table[] = { { ATH_INIT_CTL_NAME(CTL_AUTO) .procname = "rate", .mode = 0555, .child = ath_rate_static_sysctls - }, { 0 } + }, { } }; static ctl_table ath_ath_table[] = { { ATH_INIT_CTL_NAME(DEV_ATH) .procname = "ath", .mode = 0555, .child = ath_rate_table - }, { 0 } + }, { } }; static ctl_table ath_root_table[] = { { ATH_INIT_CTL_NAME(CTL_DEV) .procname = "dev", .mode = 0555, .child = ath_ath_table - }, { 0 } + }, { } }; static struct ctl_table_header *ath_sysctl_header; Modified: madwifi/branches/madwifi-0.9.4/net80211/ieee80211_linux.c =================================================================== --- madwifi/branches/madwifi-0.9.4/net80211/ieee80211_linux.c 2011-08-03 05:43:55 UTC (rev 4161) +++ madwifi/branches/madwifi-0.9.4/net80211/ieee80211_linux.c 2011-08-03 06:25:42 UTC (rev 4162) @@ -659,7 +659,7 @@ .mode = 0444, .proc_handler = proc_dostring }, - { 0 } + { } }; void |
From: Pavel R. <svn...@ma...> - 2011-08-03 05:44:09
|
Project : madwifi Revision : 4161 Author : proski (Pavel Roskin) Date : 2011-08-03 07:43:55 +0200 (Wed, 03 Aug 2011) Log Message : Don't use "{ 0 }" to initialize structures, use "{ }" Affected Files: * madwifi/trunk/ath/if_ath.c updated * madwifi/trunk/ath/if_ath_pci.c updated * madwifi/trunk/ath_hal/ah_os.c updated * madwifi/trunk/ath_rate/amrr/amrr.c updated * madwifi/trunk/ath_rate/onoe/onoe.c updated * madwifi/trunk/net80211/ieee80211_linux.c updated Modified: madwifi/trunk/ath/if_ath.c =================================================================== --- madwifi/trunk/ath/if_ath.c 2011-08-03 01:30:00 UTC (rev 4160) +++ madwifi/trunk/ath/if_ath.c 2011-08-03 05:43:55 UTC (rev 4161) @@ -11340,7 +11340,7 @@ .proc_handler = ath_sysctl_halparam, .extra2 = (void *)ATH_INTMIT, }, - { 0 } + { } }; static void @@ -11535,21 +11535,21 @@ .maxlen = sizeof(ath_xchanmode), .proc_handler = proc_dointvec }, - { 0 } + { } }; static ctl_table ath_ath_table[] = { { ATH_INIT_CTL_NAME(DEV_ATH) .procname = "ath", .mode = 0555, .child = ath_static_sysctls - }, { 0 } + }, { } }; static ctl_table ath_root_table[] = { { ATH_INIT_CTL_NAME(CTL_DEV) .procname = "dev", .mode = 0555, .child = ath_ath_table - }, { 0 } + }, { } }; static struct ctl_table_header *ath_sysctl_header; Modified: madwifi/trunk/ath/if_ath_pci.c =================================================================== --- madwifi/trunk/ath/if_ath_pci.c 2011-08-03 01:30:00 UTC (rev 4160) +++ madwifi/trunk/ath/if_ath_pci.c 2011-08-03 05:43:55 UTC (rev 4161) @@ -119,7 +119,7 @@ #endif { 0x168c, 0x002a, PCI_ANY_ID, PCI_ANY_ID }, /* AR9280 PCI Express */ { 0x168c, 0x9013, PCI_ANY_ID, PCI_ANY_ID }, /* sonicwall */ - { 0 } + { } }; static u16 ath_devidmap[][2] = { Modified: madwifi/trunk/ath_hal/ah_os.c =================================================================== --- madwifi/trunk/ath_hal/ah_os.c 2011-08-03 01:30:00 UTC (rev 4160) +++ madwifi/trunk/ath_hal/ah_os.c 2011-08-03 05:43:55 UTC (rev 4161) @@ -1025,28 +1025,28 @@ .proc_handler = proc_dointvec }, #endif /* AH_DEBUG_ALQ */ - { 0 } + { } }; static ctl_table ath_hal_table[] = { { ATH_INIT_CTL_NAME(CTL_AUTO) .procname = "hal", .mode = 0555, .child = ath_hal_sysctls - }, { 0 } + }, { } }; static ctl_table ath_ath_table[] = { { ATH_INIT_CTL_NAME(DEV_ATH) .procname = "ath", .mode = 0555, .child = ath_hal_table - }, { 0 } + }, { } }; static ctl_table ath_root_table[] = { { ATH_INIT_CTL_NAME(CTL_DEV) .procname = "dev", .mode = 0555, .child = ath_ath_table - }, { 0 } + }, { } }; static struct ctl_table_header *ath_hal_sysctl_header; Modified: madwifi/trunk/ath_rate/amrr/amrr.c =================================================================== --- madwifi/trunk/ath_rate/amrr/amrr.c 2011-08-03 01:30:00 UTC (rev 4160) +++ madwifi/trunk/ath_rate/amrr/amrr.c 2011-08-03 05:43:55 UTC (rev 4161) @@ -528,28 +528,28 @@ .extra2 = &maxint, .proc_handler = proc_dointvec_minmax }, - { 0 } + { } }; static ctl_table ath_rate_table[] = { { ATH_INIT_CTL_NAME(CTL_AUTO) .procname = "rate_amrr", .mode = 0555, .child = ath_rate_static_sysctls - }, { 0 } + }, { } }; static ctl_table ath_ath_table[] = { { ATH_INIT_CTL_NAME(DEV_ATH) .procname = "ath", .mode = 0555, .child = ath_rate_table - }, { 0 } + }, { } }; static ctl_table ath_root_table[] = { { ATH_INIT_CTL_NAME(CTL_DEV) .procname = "dev", .mode = 0555, .child = ath_ath_table - }, { 0 } + }, { } }; static struct ctl_table_header *ath_sysctl_header; Modified: madwifi/trunk/ath_rate/onoe/onoe.c =================================================================== --- madwifi/trunk/ath_rate/onoe/onoe.c 2011-08-03 01:30:00 UTC (rev 4160) +++ madwifi/trunk/ath_rate/onoe/onoe.c 2011-08-03 05:43:55 UTC (rev 4161) @@ -474,28 +474,28 @@ .maxlen = sizeof(ath_rate_raise_threshold), .proc_handler = proc_dointvec }, - { 0 } + { } }; static ctl_table ath_rate_table[] = { { ATH_INIT_CTL_NAME(CTL_AUTO) .procname = "rate_onoe", .mode = 0555, .child = ath_rate_static_sysctls - }, { 0 } + }, { } }; static ctl_table ath_ath_table[] = { { ATH_INIT_CTL_NAME(DEV_ATH) .procname = "ath", .mode = 0555, .child = ath_rate_table - }, { 0 } + }, { } }; static ctl_table ath_root_table[] = { { ATH_INIT_CTL_NAME(CTL_DEV) .procname = "dev", .mode = 0555, .child = ath_ath_table - }, { 0 } + }, { } }; static struct ctl_table_header *ath_sysctl_header; Modified: madwifi/trunk/net80211/ieee80211_linux.c =================================================================== --- madwifi/trunk/net80211/ieee80211_linux.c 2011-08-03 01:30:00 UTC (rev 4160) +++ madwifi/trunk/net80211/ieee80211_linux.c 2011-08-03 05:43:55 UTC (rev 4161) @@ -937,7 +937,7 @@ .mode = 0444, .proc_handler = proc_dostring }, - { 0 } + { } }; void |
From: Pavel R. <svn...@ma...> - 2011-08-03 01:30:14
|
Project : madwifi Revision : 4160 Author : proski (Pavel Roskin) Date : 2011-08-03 03:30:00 +0200 (Wed, 03 Aug 2011) Log Message : Fix dubious formatting after "if" Found by coccinelle. Affected Files: * madwifi/trunk/ath/if_ath.c updated Modified: madwifi/trunk/ath/if_ath.c =================================================================== --- madwifi/trunk/ath/if_ath.c 2011-08-03 01:22:41 UTC (rev 4159) +++ madwifi/trunk/ath/if_ath.c 2011-08-03 01:30:00 UTC (rev 4160) @@ -1799,8 +1799,8 @@ return ret; /* Do the same as in ath_getchannels() */ - ath_radar_correct_dfs_flags(sc, channel); - + ath_radar_correct_dfs_flags(sc, channel); + /* Restore CHANNEL_DFS_CLEAR and CHANNEL_INTERFERENCE flags */ #define CHANNEL_DFS_FLAGS (CHANNEL_DFS_CLEAR|CHANNEL_INTERFERENCE) channel->privFlags = (channel->privFlags & ~CHANNEL_DFS_FLAGS) | |
From: Pavel R. <svn...@ma...> - 2011-08-03 01:22:54
|
Project : madwifi Revision : 4159 Author : proski (Pavel Roskin) Date : 2011-08-03 03:22:41 +0200 (Wed, 03 Aug 2011) Log Message : Remove useless cast of kmalloc() result Found by coccinelle. Affected Files: * madwifi/branches/madwifi-0.9.4/net80211/if_media.c updated Modified: madwifi/branches/madwifi-0.9.4/net80211/if_media.c =================================================================== --- madwifi/branches/madwifi-0.9.4/net80211/if_media.c 2011-08-03 01:20:36 UTC (rev 4158) +++ madwifi/branches/madwifi-0.9.4/net80211/if_media.c 2011-08-03 01:22:41 UTC (rev 4159) @@ -290,8 +290,8 @@ return (-EINVAL); if (ifmr->ifm_count != 0) { - kptr = (int *)kmalloc(ifmr->ifm_count * sizeof(int), - GFP_KERNEL); + kptr = kmalloc(ifmr->ifm_count * sizeof(int), + GFP_KERNEL); if (kptr == NULL) return (-ENOMEM); |
From: Pavel R. <svn...@ma...> - 2011-08-03 01:20:48
|
Project : madwifi Revision : 4158 Author : proski (Pavel Roskin) Date : 2011-08-03 03:20:36 +0200 (Wed, 03 Aug 2011) Log Message : Fix dubious formatting after "if" Found by coccinelle. Affected Files: * madwifi/branches/madwifi-0.9.4/ath/if_ath.c updated Modified: madwifi/branches/madwifi-0.9.4/ath/if_ath.c =================================================================== --- madwifi/branches/madwifi-0.9.4/ath/if_ath.c 2011-08-03 01:11:19 UTC (rev 4157) +++ madwifi/branches/madwifi-0.9.4/ath/if_ath.c 2011-08-03 01:20:36 UTC (rev 4158) @@ -7396,7 +7396,7 @@ * this is a DEAUTH message that was sent and the * node was timed out due to inactivity. */ - ieee80211_free_node(ni); + ieee80211_free_node(ni); } bus_unmap_single(sc->sc_bdev, bf->bf_skbaddr, |