diff options
| author |   Alexander Aring <alex.aring@gmail.com> | 2014-10-26 09:37:01 +0100 |
|---|---|---|
| committer |   Marcel Holtmann <marcel@holtmann.org> | 2014-10-26 17:23:50 +0100 |
| commit | 50c6fb9965907732b4f5c45bd3bacf4b4f3463b9 (patch) | |
| tree | ccb8ce86981b34f7adb884d77115f8bf0c4863f6 /net/mac802154/monitor.c | |
| parent | mac802154: remove ieee802154_addr from driver_ops (diff) | |
| download | linux-dev-50c6fb9965907732b4f5c45bd3bacf4b4f3463b9.tar.xz linux-dev-50c6fb9965907732b4f5c45bd3bacf4b4f3463b9.zip | |
mac802154: tx: move xmit callback to tx file
This patch moves the netdev xmit callback functions into the tx.c file.
Signed-off-by: Alexander Aring <alex.aring@gmail.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Diffstat (limited to 'net/mac802154/monitor.c')
| -rw-r--r-- | net/mac802154/monitor.c | 27 |
1 files changed, 0 insertions, 27 deletions
diff --git a/net/mac802154/monitor.c b/net/mac802154/monitor.c index f8ea6dc8dda5..cb9600bcca51 100644 --- a/net/mac802154/monitor.c +++ b/net/mac802154/monitor.c @@ -30,33 +30,6 @@ #include "ieee802154_i.h" -static netdev_tx_t mac802154_monitor_xmit(struct sk_buff *skb, - struct net_device *dev) -{ - struct ieee802154_sub_if_data *sdata; - u8 chan, page; - - sdata = IEEE802154_DEV_TO_SUB_IF(dev); - - /* FIXME: locking */ - chan = sdata->local->phy->current_channel; - page = sdata->local->phy->current_page; - - if (chan == MAC802154_CHAN_NONE) /* not initialized */ - return NETDEV_TX_OK; - - if (WARN_ON(page >= WPAN_NUM_PAGES) || - WARN_ON(chan >= WPAN_NUM_CHANNELS)) - return NETDEV_TX_OK; - - skb->skb_iif = dev->ifindex; - dev->stats.tx_packets++; - dev->stats.tx_bytes += skb->len; - - return mac802154_tx(sdata->local, skb, page, chan); -} - - void mac802154_monitors_rx(struct ieee802154_local *local, struct sk_buff *skb) { struct sk_buff *skb2; |