diff options
| author | Patrick McHardy <kaber@trash.net> | 2009-06-11 10:00:49 -0400 |
|---|---|---|
| committer | Patrick McHardy <kaber@trash.net> | 2009-06-11 10:00:49 -0400 |
| commit | 36432dae73cf2c90a59b39c8df9fd8219272b005 (patch) | |
| tree | 660b9104305a809ec4fdeb295ca13d6e90790ecc /include/linux/if_ether.h | |
| parent | 440f0d588555892601cfe511728a0fc0c8204063 (diff) | |
| parent | bb400801c2f40bbd9a688818323ad09abfc4e581 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6
Diffstat (limited to 'include/linux/if_ether.h')
| -rw-r--r-- | include/linux/if_ether.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/if_ether.h b/include/linux/if_ether.h index cfe4fe1b7132..11a60e4f0a66 100644 --- a/include/linux/if_ether.h +++ b/include/linux/if_ether.h | |||
| @@ -106,6 +106,7 @@ | |||
| 106 | #define ETH_P_DSA 0x001B /* Distributed Switch Arch. */ | 106 | #define ETH_P_DSA 0x001B /* Distributed Switch Arch. */ |
| 107 | #define ETH_P_TRAILER 0x001C /* Trailer switch tagging */ | 107 | #define ETH_P_TRAILER 0x001C /* Trailer switch tagging */ |
| 108 | #define ETH_P_PHONET 0x00F5 /* Nokia Phonet frames */ | 108 | #define ETH_P_PHONET 0x00F5 /* Nokia Phonet frames */ |
| 109 | #define ETH_P_IEEE802154 0x00F6 /* IEEE802.15.4 frame */ | ||
| 109 | 110 | ||
| 110 | /* | 111 | /* |
| 111 | * This is an Ethernet frame header. | 112 | * This is an Ethernet frame header. |