aboutsummaryrefslogtreecommitdiffstats
path: root/net/ieee80211
diff options
context:
space:
mode:
authorHong Liu <hong.liu@intel.com>2005-10-19 17:31:34 -0400
committerJames Ketrenos <jketreno@linux.intel.com>2005-10-19 17:49:03 -0400
commit5b74eda78db410b979b7d450221c971fdebf5d29 (patch)
tree4dd2ee158b10bf11e4f34ba00a28e09cdacbf272 /net/ieee80211
parentc4cfe567b92d5663f98e2f82f28ffc3069fc982f (diff)
Fixed problem with not being able to decrypt/encrypt broadcast packets.
Signed-off-by: James Ketrenos <jketreno@linux.intel.com>
Diffstat (limited to 'net/ieee80211')
-rw-r--r--net/ieee80211/ieee80211_rx.c3
-rw-r--r--net/ieee80211/ieee80211_tx.c3
2 files changed, 4 insertions, 2 deletions
diff --git a/net/ieee80211/ieee80211_rx.c b/net/ieee80211/ieee80211_rx.c
index 6b005cb0caa0..ce694cf5c160 100644
--- a/net/ieee80211/ieee80211_rx.c
+++ b/net/ieee80211/ieee80211_rx.c
@@ -409,7 +409,8 @@ int ieee80211_rx(struct ieee80211_device *ieee, struct sk_buff *skb,
409 return 1; 409 return 1;
410 } 410 }
411 411
412 if (is_multicast_ether_addr(hdr->addr1) ? ieee->host_mc_decrypt : 412 if ((is_multicast_ether_addr(hdr->addr1) ||
413 is_broadcast_ether_addr(hdr->addr2)) ? ieee->host_mc_decrypt :
413 ieee->host_decrypt) { 414 ieee->host_decrypt) {
414 int idx = 0; 415 int idx = 0;
415 if (skb->len >= hdrlen + 3) 416 if (skb->len >= hdrlen + 3)
diff --git a/net/ieee80211/ieee80211_tx.c b/net/ieee80211/ieee80211_tx.c
index 42c50619aa8e..2955b7aa5a38 100644
--- a/net/ieee80211/ieee80211_tx.c
+++ b/net/ieee80211/ieee80211_tx.c
@@ -338,7 +338,8 @@ int ieee80211_xmit(struct sk_buff *skb, struct net_device *dev)
338 if (host_encrypt || ieee->host_open_frag) { 338 if (host_encrypt || ieee->host_open_frag) {
339 /* Determine fragmentation size based on destination (multicast 339 /* Determine fragmentation size based on destination (multicast
340 * and broadcast are not fragmented) */ 340 * and broadcast are not fragmented) */
341 if (is_multicast_ether_addr(dest)) 341 if (is_multicast_ether_addr(dest) ||
342 is_broadcast_ether_addr(dest))
342 frag_size = MAX_FRAG_THRESHOLD; 343 frag_size = MAX_FRAG_THRESHOLD;
343 else 344 else
344 frag_size = ieee->fts; 345 frag_size = ieee->fts;