diff options
Diffstat (limited to 'net/mac80211/tx.c')
-rw-r--r-- | net/mac80211/tx.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c index d238a8939a09..2ffb35d3f566 100644 --- a/net/mac80211/tx.c +++ b/net/mac80211/tx.c | |||
@@ -1627,7 +1627,7 @@ int ieee80211_subif_start_xmit(struct sk_buff *skb, | |||
1627 | u32 sta_flags = 0; | 1627 | u32 sta_flags = 0; |
1628 | 1628 | ||
1629 | if (unlikely(skb->len < ETH_HLEN)) { | 1629 | if (unlikely(skb->len < ETH_HLEN)) { |
1630 | ret = 0; | 1630 | ret = NETDEV_TX_OK; |
1631 | goto fail; | 1631 | goto fail; |
1632 | } | 1632 | } |
1633 | 1633 | ||
@@ -1664,7 +1664,7 @@ int ieee80211_subif_start_xmit(struct sk_buff *skb, | |||
1664 | if (!sdata->u.mesh.mshcfg.dot11MeshTTL) { | 1664 | if (!sdata->u.mesh.mshcfg.dot11MeshTTL) { |
1665 | /* Do not send frames with mesh_ttl == 0 */ | 1665 | /* Do not send frames with mesh_ttl == 0 */ |
1666 | sdata->u.mesh.mshstats.dropped_frames_ttl++; | 1666 | sdata->u.mesh.mshstats.dropped_frames_ttl++; |
1667 | ret = 0; | 1667 | ret = NETDEV_TX_OK; |
1668 | goto fail; | 1668 | goto fail; |
1669 | } | 1669 | } |
1670 | memset(&mesh_hdr, 0, sizeof(mesh_hdr)); | 1670 | memset(&mesh_hdr, 0, sizeof(mesh_hdr)); |
@@ -1724,7 +1724,7 @@ int ieee80211_subif_start_xmit(struct sk_buff *skb, | |||
1724 | hdrlen = 24; | 1724 | hdrlen = 24; |
1725 | break; | 1725 | break; |
1726 | default: | 1726 | default: |
1727 | ret = 0; | 1727 | ret = NETDEV_TX_OK; |
1728 | goto fail; | 1728 | goto fail; |
1729 | } | 1729 | } |
1730 | 1730 | ||
@@ -1766,7 +1766,7 @@ int ieee80211_subif_start_xmit(struct sk_buff *skb, | |||
1766 | 1766 | ||
1767 | I802_DEBUG_INC(local->tx_handlers_drop_unauth_port); | 1767 | I802_DEBUG_INC(local->tx_handlers_drop_unauth_port); |
1768 | 1768 | ||
1769 | ret = 0; | 1769 | ret = NETDEV_TX_OK; |
1770 | goto fail; | 1770 | goto fail; |
1771 | } | 1771 | } |
1772 | 1772 | ||
@@ -1858,10 +1858,10 @@ int ieee80211_subif_start_xmit(struct sk_buff *skb, | |||
1858 | dev->trans_start = jiffies; | 1858 | dev->trans_start = jiffies; |
1859 | dev_queue_xmit(skb); | 1859 | dev_queue_xmit(skb); |
1860 | 1860 | ||
1861 | return 0; | 1861 | return NETDEV_TX_OK; |
1862 | 1862 | ||
1863 | fail: | 1863 | fail: |
1864 | if (!ret) | 1864 | if (ret == NETDEV_TX_OK) |
1865 | dev_kfree_skb(skb); | 1865 | dev_kfree_skb(skb); |
1866 | 1866 | ||
1867 | return ret; | 1867 | return ret; |