2 files changed, 8 insertions, 0 deletions

diff --git a/include/linux/irda.h b/include/linux/irda.h
index 35911bd4dbe8..8e3735714c1c 100644
--- a/include/linux/irda.h
+++ b/include/linux/irda.h
@@ -242,6 +242,7 @@ enum nl80211_attrs {
 /* IrDA modes */
 #define IRDA_MODE_PRIMARY   0x1
 #define IRDA_MODE_SECONDARY 0x2
+#define IRDA_MODE_MONITOR   0x4
 
 #endif /* KERNEL_IRDA_H */
 
diff --git a/net/irda/irlap_frame.c b/net/irda/irlap_frame.c
index 3013c49ab975..25a3444a9234 100644
--- a/net/irda/irlap_frame.c
+++ b/net/irda/irlap_frame.c
@@ -101,6 +101,13 @@ void irlap_queue_xmit(struct irlap_cb *self, struct sk_buff *skb)
 
         irlap_insert_info(self, skb);
 
+        if (unlikely(self->mode & IRDA_MODE_MONITOR)) {
+                IRDA_DEBUG(3, "%s(): %s is in monitor mode\n", __FUNCTION__,
+                           self->netdev->name);
+                dev_kfree_skb(skb);
+                return;
+        }
+
         dev_queue_xmit(skb);
 }