diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-12-21 18:52:24 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-12-21 18:52:24 -0500 |
| commit | 5b825ed22b02691e39774e8b2a077d1807969ec7 (patch) | |
| tree | ab5d1e8132d72ea9a60cfe8d381a96ee89dcd2cf /include/net/ax25.h | |
| parent | a4c80d2ae2cac531c6655f75658dae02c488abc7 (diff) | |
| parent | d883a0367149506e8b7a3f31891d1ea30b9377f3 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (23 commits)
[IPV4]: OOPS with NETLINK_FIB_LOOKUP netlink socket
[NET]: Fix function put_cmsg() which may cause usr application memory overflow
[ATM]: Spelling fixes
[NETFILTER] ipv4: Spelling fixes
[NETFILTER]: Spelling fixes
[SCTP]: Spelling fixes
[NETLABEL]: Spelling fixes
[PKT_SCHED]: Spelling fixes
[NET] net/core/: Spelling fixes
[IPV6]: Spelling fixes
[IRDA]: Spelling fixes
[DCCP]: Spelling fixes
[NET] include/net/: Spelling fixes
[NET]: Correct two mistaken skb_reset_mac_header() conversions.
[IPV4] ip_gre: set mac_header correctly in receive path
[XFRM]: Audit function arguments misordered
[IPSEC]: Avoid undefined shift operation when testing algorithm ID
[IPV4] ARP: Remove not used code
[TG3]: Endianness bugfix.
[TG3]: Endianness annotations.
...
Diffstat (limited to 'include/net/ax25.h')
| -rw-r--r-- | include/net/ax25.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/net/ax25.h b/include/net/ax25.h index 4e3cd93f81fc..32a57e1dee3a 100644 --- a/include/net/ax25.h +++ b/include/net/ax25.h | |||
| @@ -35,7 +35,7 @@ | |||
| 35 | #define AX25_P_ATALK 0xca /* Appletalk */ | 35 | #define AX25_P_ATALK 0xca /* Appletalk */ |
| 36 | #define AX25_P_ATALK_ARP 0xcb /* Appletalk ARP */ | 36 | #define AX25_P_ATALK_ARP 0xcb /* Appletalk ARP */ |
| 37 | #define AX25_P_IP 0xcc /* ARPA Internet Protocol */ | 37 | #define AX25_P_IP 0xcc /* ARPA Internet Protocol */ |
| 38 | #define AX25_P_ARP 0xcd /* ARPA Adress Resolution */ | 38 | #define AX25_P_ARP 0xcd /* ARPA Address Resolution */ |
| 39 | #define AX25_P_FLEXNET 0xce /* FlexNet */ | 39 | #define AX25_P_FLEXNET 0xce /* FlexNet */ |
| 40 | #define AX25_P_NETROM 0xcf /* NET/ROM */ | 40 | #define AX25_P_NETROM 0xcf /* NET/ROM */ |
| 41 | #define AX25_P_TEXT 0xF0 /* No layer 3 protocol impl. */ | 41 | #define AX25_P_TEXT 0xF0 /* No layer 3 protocol impl. */ |