mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2025-04-21 12:27:27 +03:00
refresh madwifi patches using upstream style
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@11351 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
@@ -1,7 +1,5 @@
|
||||
Index: madwifi-trunk-r3314/ath/if_ath.c
|
||||
===================================================================
|
||||
--- madwifi-trunk-r3314.orig/ath/if_ath.c
|
||||
+++ madwifi-trunk-r3314/ath/if_ath.c
|
||||
--- a/ath/if_ath.c
|
||||
+++ b/ath/if_ath.c
|
||||
@@ -184,7 +184,11 @@
|
||||
struct sk_buff *, int, int, u_int64_t);
|
||||
static void ath_setdefantenna(struct ath_softc *, u_int);
|
||||
@@ -375,10 +373,8 @@ Index: madwifi-trunk-r3314/ath/if_ath.c
|
||||
}
|
||||
ATH_UNLOCK(sc);
|
||||
|
||||
Index: madwifi-trunk-r3314/ath/if_athvar.h
|
||||
===================================================================
|
||||
--- madwifi-trunk-r3314.orig/ath/if_athvar.h
|
||||
+++ madwifi-trunk-r3314/ath/if_athvar.h
|
||||
--- a/ath/if_athvar.h
|
||||
+++ b/ath/if_athvar.h
|
||||
@@ -53,6 +53,10 @@
|
||||
# include <asm/bitops.h>
|
||||
#endif
|
||||
@@ -425,10 +421,8 @@ Index: madwifi-trunk-r3314/ath/if_athvar.h
|
||||
|
||||
#define ATH_RXBUF_LOCK_INIT(_sc) spin_lock_init(&(_sc)->sc_rxbuflock)
|
||||
#define ATH_RXBUF_LOCK_DESTROY(_sc)
|
||||
Index: madwifi-trunk-r3314/net80211/ieee80211_input.c
|
||||
===================================================================
|
||||
--- madwifi-trunk-r3314.orig/net80211/ieee80211_input.c
|
||||
+++ madwifi-trunk-r3314/net80211/ieee80211_input.c
|
||||
--- a/net80211/ieee80211_input.c
|
||||
+++ b/net80211/ieee80211_input.c
|
||||
@@ -1198,7 +1198,7 @@
|
||||
/* attach vlan tag */
|
||||
struct ieee80211_node *ni_tmp = SKB_CB(skb)->ni;
|
||||
@@ -460,10 +454,8 @@ Index: madwifi-trunk-r3314/net80211/ieee80211_input.c
|
||||
* device was too busy */
|
||||
if (ni_tmp != NULL) {
|
||||
/* node reference was leaked */
|
||||
Index: madwifi-trunk-r3314/net80211/ieee80211_monitor.c
|
||||
===================================================================
|
||||
--- madwifi-trunk-r3314.orig/net80211/ieee80211_monitor.c
|
||||
+++ madwifi-trunk-r3314/net80211/ieee80211_monitor.c
|
||||
--- a/net80211/ieee80211_monitor.c
|
||||
+++ b/net80211/ieee80211_monitor.c
|
||||
@@ -584,8 +584,8 @@
|
||||
skb1->protocol =
|
||||
__constant_htons(0x0019); /* ETH_P_80211_RAW */
|
||||
@@ -475,10 +467,8 @@ Index: madwifi-trunk-r3314/net80211/ieee80211_monitor.c
|
||||
* device was too busy, reclaim the ref. in
|
||||
* the skb. */
|
||||
if (SKB_CB(skb1)->ni != NULL)
|
||||
Index: madwifi-trunk-r3314/net80211/ieee80211_skb.c
|
||||
===================================================================
|
||||
--- madwifi-trunk-r3314.orig/net80211/ieee80211_skb.c
|
||||
+++ madwifi-trunk-r3314/net80211/ieee80211_skb.c
|
||||
--- a/net80211/ieee80211_skb.c
|
||||
+++ b/net80211/ieee80211_skb.c
|
||||
@@ -73,7 +73,7 @@
|
||||
#undef dev_queue_xmit
|
||||
#undef kfree_skb
|
||||
@@ -508,10 +498,8 @@ Index: madwifi-trunk-r3314/net80211/ieee80211_skb.c
|
||||
EXPORT_SYMBOL(alloc_skb_debug);
|
||||
EXPORT_SYMBOL(dev_alloc_skb_debug);
|
||||
EXPORT_SYMBOL(skb_clone_debug);
|
||||
Index: madwifi-trunk-r3314/net80211/ieee80211_skb.h
|
||||
===================================================================
|
||||
--- madwifi-trunk-r3314.orig/net80211/ieee80211_skb.h
|
||||
+++ madwifi-trunk-r3314/net80211/ieee80211_skb.h
|
||||
--- a/net80211/ieee80211_skb.h
|
||||
+++ b/net80211/ieee80211_skb.h
|
||||
@@ -116,7 +116,7 @@
|
||||
int vlan_hwaccel_receive_skb_debug(struct sk_buff *skb,
|
||||
struct vlan_group *grp, unsigned short vlan_tag,
|
||||
|
||||
Reference in New Issue
Block a user