Skip to content

Commit

Permalink
Staging: rtl8192su: fix build error
Browse files Browse the repository at this point in the history
This fixes a build error when selecting the rtl8192su driver as a
module.  This has been reported by me, and the opensuse kernel developer
team, and I finally tracked it down.

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  • Loading branch information
Greg Kroah-Hartman committed Aug 7, 2009
1 parent 2c63abf commit ce9c010
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 4 deletions.
2 changes: 1 addition & 1 deletion drivers/staging/rtl8192su/ieee80211.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 *);

Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/rtl8192su/ieee80211/ieee80211.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 *);

Expand Down
3 changes: 2 additions & 1 deletion drivers/staging/rtl8192su/ieee80211/ieee80211_tx.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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);
2 changes: 1 addition & 1 deletion drivers/staging/rtl8192su/r8192U_core.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit ce9c010

Please sign in to comment.