diff options
-rw-r--r-- | net/mac802154/tx.c | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/net/mac802154/tx.c b/net/mac802154/tx.c index 74882c72b6c3..fe2e17e6fee3 100644 --- a/net/mac802154/tx.c +++ b/net/mac802154/tx.c | |||
@@ -37,13 +37,7 @@ struct ieee802154_xmit_cb { | |||
37 | struct ieee802154_local *local; | 37 | struct ieee802154_local *local; |
38 | }; | 38 | }; |
39 | 39 | ||
40 | static inline struct ieee802154_xmit_cb * | 40 | static struct ieee802154_xmit_cb ieee802154_xmit_cb; |
41 | ieee802154_xmit_cb(const struct sk_buff *skb) | ||
42 | { | ||
43 | BUILD_BUG_ON(sizeof(skb->cb) < sizeof(struct ieee802154_xmit_cb)); | ||
44 | |||
45 | return (struct ieee802154_xmit_cb *)skb->cb; | ||
46 | } | ||
47 | 41 | ||
48 | static void ieee802154_xmit_worker(struct work_struct *work) | 42 | static void ieee802154_xmit_worker(struct work_struct *work) |
49 | { | 43 | { |
@@ -84,7 +78,6 @@ err_tx: | |||
84 | static netdev_tx_t | 78 | static netdev_tx_t |
85 | ieee802154_tx(struct ieee802154_local *local, struct sk_buff *skb) | 79 | ieee802154_tx(struct ieee802154_local *local, struct sk_buff *skb) |
86 | { | 80 | { |
87 | struct ieee802154_xmit_cb *cb = ieee802154_xmit_cb(skb); | ||
88 | struct net_device *dev = skb->dev; | 81 | struct net_device *dev = skb->dev; |
89 | int ret; | 82 | int ret; |
90 | 83 | ||
@@ -113,11 +106,11 @@ ieee802154_tx(struct ieee802154_local *local, struct sk_buff *skb) | |||
113 | dev->stats.tx_packets++; | 106 | dev->stats.tx_packets++; |
114 | dev->stats.tx_bytes += skb->len; | 107 | dev->stats.tx_bytes += skb->len; |
115 | } else { | 108 | } else { |
116 | INIT_WORK(&cb->work, ieee802154_xmit_worker); | 109 | INIT_WORK(&ieee802154_xmit_cb.work, ieee802154_xmit_worker); |
117 | cb->skb = skb; | 110 | ieee802154_xmit_cb.skb = skb; |
118 | cb->local = local; | 111 | ieee802154_xmit_cb.local = local; |
119 | 112 | ||
120 | queue_work(local->workqueue, &cb->work); | 113 | queue_work(local->workqueue, &ieee802154_xmit_cb.work); |
121 | } | 114 | } |
122 | 115 | ||
123 | return NETDEV_TX_OK; | 116 | return NETDEV_TX_OK; |