projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
NetLabel: add tag verification when adding new CIPSOv4 DOI definitions
[powerpc.git]
/
net
/
ieee80211
/
ieee80211_tx.c
diff --git
a/net/ieee80211/ieee80211_tx.c
b/net/ieee80211/ieee80211_tx.c
index
bf04213
..
854fc13
100644
(file)
--- a/
net/ieee80211/ieee80211_tx.c
+++ b/
net/ieee80211/ieee80211_tx.c
@@
-337,7
+337,7
@@
int ieee80211_xmit(struct sk_buff *skb, struct net_device *dev)
hdr_len += 2;
skb->priority = ieee80211_classify(skb);
hdr_len += 2;
skb->priority = ieee80211_classify(skb);
- header.qos_ctl |=
skb->priority & IEEE80211_QCTL_TID
;
+ header.qos_ctl |=
cpu_to_le16(skb->priority & IEEE80211_QCTL_TID)
;
}
header.frame_ctl = cpu_to_le16(fc);
}
header.frame_ctl = cpu_to_le16(fc);
@@
-390,7
+390,7
@@
int ieee80211_xmit(struct sk_buff *skb, struct net_device *dev)
* this stack is providing the full 802.11 header, one will
* eventually be affixed to this fragment -- so we must account
* for it when determining the amount of payload space. */
* this stack is providing the full 802.11 header, one will
* eventually be affixed to this fragment -- so we must account
* for it when determining the amount of payload space. */
- bytes_per_frag = frag_size -
IEEE80211_3ADDR_LEN
;
+ bytes_per_frag = frag_size -
hdr_len
;
if (ieee->config &
(CFG_IEEE80211_COMPUTE_FCS | CFG_IEEE80211_RESERVE_FCS))
bytes_per_frag -= IEEE80211_FCS_LEN;
if (ieee->config &
(CFG_IEEE80211_COMPUTE_FCS | CFG_IEEE80211_RESERVE_FCS))
bytes_per_frag -= IEEE80211_FCS_LEN;
@@
-412,7
+412,7
@@
int ieee80211_xmit(struct sk_buff *skb, struct net_device *dev)
} else {
nr_frags = 1;
bytes_per_frag = bytes_last_frag = bytes;
} else {
nr_frags = 1;
bytes_per_frag = bytes_last_frag = bytes;
- frag_size = bytes +
IEEE80211_3ADDR_LEN
;
+ frag_size = bytes +
hdr_len
;
}
rts_required = (frag_size > ieee->rts
}
rts_required = (frag_size > ieee->rts
@@
-532,13
+532,6
@@
int ieee80211_xmit(struct sk_buff *skb, struct net_device *dev)
return 0;
}
return 0;
}
- if (ret == NETDEV_TX_BUSY) {
- printk(KERN_ERR "%s: NETDEV_TX_BUSY returned; "
- "driver should report queue full via "
- "ieee_device->is_queue_full.\n",
- ieee->dev->name);
- }
-
ieee80211_txb_free(txb);
}
ieee80211_txb_free(txb);
}