Skip to content

Commit

Permalink
mac802154: tx: make worker information static
Browse files Browse the repository at this point in the history
This patch moves the worker information struct out of skb control block.
Instead control block we declare it static inside of tx.c file. We can do
that, because the worker can't be used twice at the same time. It's
protected by stop and wake netdev queue.

This patch fix an issue that the "struct ieee802154_xmit_cb" doesn't fit
into the skb control block on some kernel configuartion reported by
kbuild test robot.

It was introduced by commit fe24371
("mac802154: tx: remove kmalloc in xmit hotpath").

Signed-off-by: Alexander Aring <alex.aring@gmail.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
  • Loading branch information
Alexander Aring authored and Marcel Holtmann committed Oct 26, 2014
1 parent 955aee8 commit f81f466
Showing 1 changed file with 5 additions and 12 deletions.
17 changes: 5 additions & 12 deletions net/mac802154/tx.c
Original file line number Diff line number Diff line change
Expand Up @@ -37,13 +37,7 @@ struct ieee802154_xmit_cb {
struct ieee802154_local *local;
};

static inline struct ieee802154_xmit_cb *
ieee802154_xmit_cb(const struct sk_buff *skb)
{
BUILD_BUG_ON(sizeof(skb->cb) < sizeof(struct ieee802154_xmit_cb));

return (struct ieee802154_xmit_cb *)skb->cb;
}
static struct ieee802154_xmit_cb ieee802154_xmit_cb;

static void ieee802154_xmit_worker(struct work_struct *work)
{
Expand Down Expand Up @@ -84,7 +78,6 @@ static void ieee802154_xmit_worker(struct work_struct *work)
static netdev_tx_t
ieee802154_tx(struct ieee802154_local *local, struct sk_buff *skb)
{
struct ieee802154_xmit_cb *cb = ieee802154_xmit_cb(skb);
struct net_device *dev = skb->dev;
int ret;

Expand Down Expand Up @@ -113,11 +106,11 @@ ieee802154_tx(struct ieee802154_local *local, struct sk_buff *skb)
dev->stats.tx_packets++;
dev->stats.tx_bytes += skb->len;
} else {
INIT_WORK(&cb->work, ieee802154_xmit_worker);
cb->skb = skb;
cb->local = local;
INIT_WORK(&ieee802154_xmit_cb.work, ieee802154_xmit_worker);
ieee802154_xmit_cb.skb = skb;
ieee802154_xmit_cb.local = local;

queue_work(local->workqueue, &cb->work);
queue_work(local->workqueue, &ieee802154_xmit_cb.work);
}

return NETDEV_TX_OK;
Expand Down

0 comments on commit f81f466

Please sign in to comment.