backport ETH_P_802_3_MIN
authorJohannes Berg <johannes@sipsolutions.net>
Tue, 2 Apr 2013 20:16:16 +0000 (22:16 +0200)
committerJohannes Berg <johannes@sipsolutions.net>
Tue, 2 Apr 2013 20:16:16 +0000 (22:16 +0200)
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
backport/include/linux/compat-3.10.h

index f972203b97c5c727400b708a553e619f751b49cf..5bc259b7bf638ec3680d9abe46e19acbcf2e56c3 100644 (file)
@@ -75,6 +75,18 @@ static inline void fb_enable_skip_vt_switch(struct fb_info *info)
        module_driver(__pcmcia_driver, pcmcia_register_driver, \
                        pcmcia_unregister_driver)
 
+/*
+ * backport of:
+ * commit e5c5d22e8dcf7c2d430336cbf8e180bd38e8daf1
+ * Author: Simon Horman <horms@verge.net.au>
+ * Date:   Thu Mar 28 13:38:25 2013 +0900
+ * 
+ *     net: add ETH_P_802_3_MIN
+ */
+#ifndef ETH_P_802_3_MIN
+#define ETH_P_802_3_MIN 0x0600
+#endif
+
 #else /* kernel is >= 3.10 */
 /*
  * We'd delete this upstream ever got this, we use our