diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-12-04 13:03:12 +1100 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-12-04 13:06:46 +1100 |
commit | cf76a3a7b8292423b127f6c0ecbacac8e65d40ad (patch) | |
tree | 8fc46b6d104d5fdc68f5bbf7e380243c6fb5cc19 /drivers/net/wireless/libertas/tx.c | |
parent | eabeb7dac4934602a90b14649c07c13eb7e43d90 (diff) | |
parent | 3f8c6c9c7739d18e4b75902fdcbf6c3ba98dc123 (diff) |
Merge commit 'net/master'
Diffstat (limited to 'drivers/net/wireless/libertas/tx.c')
-rw-r--r-- | drivers/net/wireless/libertas/tx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/libertas/tx.c b/drivers/net/wireless/libertas/tx.c index a4972fed2941..dac462641170 100644 --- a/drivers/net/wireless/libertas/tx.c +++ b/drivers/net/wireless/libertas/tx.c @@ -60,7 +60,7 @@ static u32 convert_radiotap_rate_to_mv(u8 rate) int lbs_hard_start_xmit(struct sk_buff *skb, struct net_device *dev) { unsigned long flags; - struct lbs_private *priv = dev->priv; + struct lbs_private *priv = netdev_priv(dev); struct txpd *txpd; char *p802x_hdr; uint16_t pkt_len; |