---

yaml --- r: 58960 b: refs/heads/master c: 4117252 h: refs/heads/master v: v3
git-mirror · Jul 11, 2007 · 782d480 · 782d480
1 parent 7dba3fc
commit 782d480
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 89da1ecf5483e6aa29b456a15ad6d05a6797c5a5
+refs/heads/master: 411725280bd0058ebb83c0e32133b7a94902c3a6
diff --git a/trunk/include/linux/irda.h b/trunk/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/trunk/net/irda/irlap_frame.c b/trunk/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);
 }