diff options
| author | Alexander Aring <alex.aring@gmail.com> | 2014-10-27 17:13:33 +0100 |
|---|---|---|
| committer | Marcel Holtmann <marcel@holtmann.org> | 2014-10-27 18:07:42 +0100 |
| commit | 4ca18be54f507ddb2bedb44c2e3b988163684988 (patch) | |
| tree | 4bcd9d3ab65c258526178d740b80a2c9dadcb38e | |
| parent | 2a9820c9e20a7889bf464e1edff5f75d685a8214 (diff) | |
mac802154: tx: remove monitor receive while xmit
This removes the call of monitor receive funktion when any interface
type call xmit. There exist no such use case that a monitor interface
should receive the actual sending frame. One use case could be that a
wpan interface and monitor interface could be running at the same time
on one phy. Then the monitor interface receives the wpan frames also.
Furthermore we adding support for promiscous mode setting. With
promiscous mode setting we can't run a wpan and monitor interface at the
same time.
Signed-off-by: Alexander Aring <alex.aring@gmail.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
| -rw-r--r-- | net/mac802154/ieee802154_i.h | 1 | ||||
| -rw-r--r-- | net/mac802154/rx.c | 3 | ||||
| -rw-r--r-- | net/mac802154/tx.c | 2 |
3 files changed, 2 insertions, 4 deletions
diff --git a/net/mac802154/ieee802154_i.h b/net/mac802154/ieee802154_i.h index be2f2f6774a..ac907d943ba 100644 --- a/net/mac802154/ieee802154_i.h +++ b/net/mac802154/ieee802154_i.h @@ -126,7 +126,6 @@ extern struct ieee802154_mlme_ops mac802154_mlme_wpan; int mac802154_slave_open(struct net_device *dev); int mac802154_slave_close(struct net_device *dev); -void mac802154_monitors_rx(struct ieee802154_local *local, struct sk_buff *skb); void mac802154_monitor_setup(struct net_device *dev); netdev_tx_t ieee802154_monitor_start_xmit(struct sk_buff *skb, struct net_device *dev); diff --git a/net/mac802154/rx.c b/net/mac802154/rx.c index d8498c5fc29..04f3d61719e 100644 --- a/net/mac802154/rx.c +++ b/net/mac802154/rx.c @@ -216,7 +216,8 @@ mac802154_wpans_rx(struct ieee802154_local *local, struct sk_buff *skb) kfree_skb(skb); } -void mac802154_monitors_rx(struct ieee802154_local *local, struct sk_buff *skb) +static void +mac802154_monitors_rx(struct ieee802154_local *local, struct sk_buff *skb) { struct sk_buff *skb2; struct ieee802154_sub_if_data *sdata; diff --git a/net/mac802154/tx.c b/net/mac802154/tx.c index 31e51e4635e..e85767355c4 100644 --- a/net/mac802154/tx.c +++ b/net/mac802154/tx.c @@ -82,8 +82,6 @@ ieee802154_tx(struct ieee802154_local *local, struct sk_buff *skb) struct net_device *dev = skb->dev; int ret; - mac802154_monitors_rx(local, skb); - if (!(local->hw.flags & IEEE802154_HW_OMIT_CKSUM)) { u16 crc = crc_ccitt(0, skb->data, skb->len); |