mac802154: tx: remove monitor receive while xmit (4ca18be5) · Commits · 戴 / test

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>

net/mac802154/ieee802154_i.h

+0 −1

Original line number	Diff line number	Diff line
		@@ -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);

net/mac802154/rx.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -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;

net/mac802154/tx.c

+0 −2

Original line number	Diff line number	Diff line
		@@ -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);

Admin message