aboutsummaryrefslogtreecommitdiffstats
path: root/net/mac80211/rx.c
diff options
context:
space:
mode:
Diffstat (limited to 'net/mac80211/rx.c')
-rw-r--r--net/mac80211/rx.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c
index 1159a43a3df6..fa68305fd59e 100644
--- a/net/mac80211/rx.c
+++ b/net/mac80211/rx.c
@@ -1372,11 +1372,11 @@ ieee80211_deliver_skb(struct ieee80211_rx_data *rx)
1372 if (is_multicast_ether_addr(skb->data)) { 1372 if (is_multicast_ether_addr(skb->data)) {
1373 if (*mesh_ttl > 0) { 1373 if (*mesh_ttl > 0) {
1374 xmit_skb = skb_copy(skb, GFP_ATOMIC); 1374 xmit_skb = skb_copy(skb, GFP_ATOMIC);
1375 if (!xmit_skb && net_ratelimit()) 1375 if (xmit_skb)
1376 xmit_skb->pkt_type = PACKET_OTHERHOST;
1377 else if (net_ratelimit())
1376 printk(KERN_DEBUG "%s: failed to clone " 1378 printk(KERN_DEBUG "%s: failed to clone "
1377 "multicast frame\n", dev->name); 1379 "multicast frame\n", dev->name);
1378 else
1379 xmit_skb->pkt_type = PACKET_OTHERHOST;
1380 } else 1380 } else
1381 IEEE80211_IFSTA_MESH_CTR_INC(&sdata->u.sta, 1381 IEEE80211_IFSTA_MESH_CTR_INC(&sdata->u.sta,
1382 dropped_frames_ttl); 1382 dropped_frames_ttl);
@@ -1462,7 +1462,7 @@ ieee80211_rx_h_amsdu(struct ieee80211_rx_data *rx)
1462 padding = ((4 - subframe_len) & 0x3); 1462 padding = ((4 - subframe_len) & 0x3);
1463 /* the last MSDU has no padding */ 1463 /* the last MSDU has no padding */
1464 if (subframe_len > remaining) { 1464 if (subframe_len > remaining) {
1465 printk(KERN_DEBUG "%s: wrong buffer size", dev->name); 1465 printk(KERN_DEBUG "%s: wrong buffer size\n", dev->name);
1466 return RX_DROP_UNUSABLE; 1466 return RX_DROP_UNUSABLE;
1467 } 1467 }
1468 1468
@@ -1485,7 +1485,7 @@ ieee80211_rx_h_amsdu(struct ieee80211_rx_data *rx)
1485 eth = (struct ethhdr *) skb_pull(skb, ntohs(len) + 1485 eth = (struct ethhdr *) skb_pull(skb, ntohs(len) +
1486 padding); 1486 padding);
1487 if (!eth) { 1487 if (!eth) {
1488 printk(KERN_DEBUG "%s: wrong buffer size ", 1488 printk(KERN_DEBUG "%s: wrong buffer size\n",
1489 dev->name); 1489 dev->name);
1490 dev_kfree_skb(frame); 1490 dev_kfree_skb(frame);
1491 return RX_DROP_UNUSABLE; 1491 return RX_DROP_UNUSABLE;
@@ -2019,7 +2019,7 @@ static void __ieee80211_rx_handle_packet(struct ieee80211_hw *hw,
2019 if (!skb_new) { 2019 if (!skb_new) {
2020 if (net_ratelimit()) 2020 if (net_ratelimit())
2021 printk(KERN_DEBUG "%s: failed to copy " 2021 printk(KERN_DEBUG "%s: failed to copy "
2022 "multicast frame for %s", 2022 "multicast frame for %s\n",
2023 wiphy_name(local->hw.wiphy), 2023 wiphy_name(local->hw.wiphy),
2024 prev->dev->name); 2024 prev->dev->name);
2025 continue; 2025 continue;