From 1ded622c8575ef95fd3b1ccc8e0ab6abf8923e6b Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Tue, 4 Aug 2009 16:53:36 -0700 Subject: [PATCH] --- yaml --- r: 156539 b: refs/heads/master c: ce9c010c5c39df05ed81a06aba492c45ee0c6f19 h: refs/heads/master i: 156537: d2539d736214d6546da9e174188e9b9deabcf471 156535: 134edd1256e5ac24636f3b3a92f65745f0e71042 v: v3 --- [refs] | 2 +- trunk/drivers/staging/rtl8192su/ieee80211.h | 2 +- trunk/drivers/staging/rtl8192su/ieee80211/ieee80211.h | 2 +- trunk/drivers/staging/rtl8192su/ieee80211/ieee80211_tx.c | 3 ++- trunk/drivers/staging/rtl8192su/r8192U_core.c | 2 +- 5 files changed, 6 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 3e3ccf004da4..c029d71f3a32 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2c63abf9e8a51dec886da482dfd8ae752581a61c +refs/heads/master: ce9c010c5c39df05ed81a06aba492c45ee0c6f19 diff --git a/trunk/drivers/staging/rtl8192su/ieee80211.h b/trunk/drivers/staging/rtl8192su/ieee80211.h index 0edb09a536f9..ea9739318037 100644 --- a/trunk/drivers/staging/rtl8192su/ieee80211.h +++ b/trunk/drivers/staging/rtl8192su/ieee80211.h @@ -2645,7 +2645,7 @@ extern int ieee80211_encrypt_fragment( struct sk_buff *frag, int hdr_len); -extern int ieee80211_xmit(struct sk_buff *skb, +extern int rtl8192_ieee80211_xmit(struct sk_buff *skb, struct net_device *dev); extern void ieee80211_txb_free(struct ieee80211_txb *); diff --git a/trunk/drivers/staging/rtl8192su/ieee80211/ieee80211.h b/trunk/drivers/staging/rtl8192su/ieee80211/ieee80211.h index 720bfcbfadc1..5e3a2cbed2b1 100644 --- a/trunk/drivers/staging/rtl8192su/ieee80211/ieee80211.h +++ b/trunk/drivers/staging/rtl8192su/ieee80211/ieee80211.h @@ -2645,7 +2645,7 @@ extern int ieee80211_encrypt_fragment( struct sk_buff *frag, int hdr_len); -extern int ieee80211_xmit(struct sk_buff *skb, +extern int rtl8192_ieee80211_xmit(struct sk_buff *skb, struct net_device *dev); extern void ieee80211_txb_free(struct ieee80211_txb *); diff --git a/trunk/drivers/staging/rtl8192su/ieee80211/ieee80211_tx.c b/trunk/drivers/staging/rtl8192su/ieee80211/ieee80211_tx.c index 7294572b990f..cba12b84be5c 100644 --- a/trunk/drivers/staging/rtl8192su/ieee80211/ieee80211_tx.c +++ b/trunk/drivers/staging/rtl8192su/ieee80211/ieee80211_tx.c @@ -618,7 +618,7 @@ void ieee80211_query_seqnum(struct ieee80211_device*ieee, struct sk_buff* skb, u } } -int ieee80211_xmit(struct sk_buff *skb, struct net_device *dev) +int rtl8192_ieee80211_xmit(struct sk_buff *skb, struct net_device *dev) { #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)) struct ieee80211_device *ieee = netdev_priv(dev); @@ -943,5 +943,6 @@ int ieee80211_xmit(struct sk_buff *skb, struct net_device *dev) return 1; } +EXPORT_SYMBOL(rtl8192_ieee80211_xmit); EXPORT_SYMBOL(ieee80211_txb_free); diff --git a/trunk/drivers/staging/rtl8192su/r8192U_core.c b/trunk/drivers/staging/rtl8192su/r8192U_core.c index 4ab250743e81..70f81a8f1291 100644 --- a/trunk/drivers/staging/rtl8192su/r8192U_core.c +++ b/trunk/drivers/staging/rtl8192su/r8192U_core.c @@ -12142,7 +12142,7 @@ static const struct net_device_ops rtl8192_netdev_ops = { .ndo_set_mac_address = r8192_set_mac_adr, .ndo_validate_addr = eth_validate_addr, .ndo_change_mtu = eth_change_mtu, - .ndo_start_xmit = ieee80211_xmit, + .ndo_start_xmit = rtl8192_ieee80211_xmit, }; #if LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0)