summaryrefslogtreecommitdiff
path: root/net/core/dev.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@athlon.transmeta.com>2002-02-04 20:30:01 -0800
committerLinus Torvalds <torvalds@athlon.transmeta.com>2002-02-04 20:30:01 -0800
commit857805c6bdc445542e35347e18f1f0d21353a52c (patch)
tree511bbe9265c90d6b092964203f8a06ac327899bd /net/core/dev.c
parent22a160fb095ca694e9f7ee29f131382e1faec889 (diff)
v2.4.13.5 -> v2.4.13.6
- me: remember to bump the version number ;) - Hugh Dickins: export "free_lru_page()" for modules - Jeff Garzik: don't change nopage arguments, just make the last a dummy one - David Miller: sparc and net updates (netfilter, VLAN etc) - Nikita Danilov: reiserfs cleanups - Jan Kara: quota initialization race - Tigran Aivazian: make the x86 microcode update driver happy about hyperthreaded P4's - me: shrink dcache/icache more aggressively - me: fix up oom-killer so that it actually works
Diffstat (limited to 'net/core/dev.c')
-rw-r--r--net/core/dev.c11
1 files changed, 10 insertions, 1 deletions
diff --git a/net/core/dev.c b/net/core/dev.c
index 4b0d8c58711e..0d1c7d924e92 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -107,6 +107,7 @@
extern int plip_init(void);
#endif
+
/* This define, if set, will randomly drop a packet when congestion
* is more than moderate. It helps fairness in the multi-interface
* case when one of them is a hog, but it kills performance for the
@@ -137,9 +138,17 @@ const char *if_port_text[] = {
* and the routines to invoke.
*
* Why 16. Because with 16 the only overlap we get on a hash of the
- * low nibble of the protocol value is RARP/SNAP/X.25.
+ * low nibble of the protocol value is RARP/SNAP/X.25.
+ *
+ * NOTE: That is no longer true with the addition of VLAN tags. Not
+ * sure which should go first, but I bet it won't make much
+ * difference if we are running VLANs. The good news is that
+ * this protocol won't be in the list unless compiled in, so
+ * the average user (w/out VLANs) will not be adversly affected.
+ * --BLG
*
* 0800 IP
+ * 8100 802.1Q VLAN
* 0001 802.3
* 0002 AX.25
* 0004 802.2