diff options
author | Rémi Denis-Courmont <remi.denis-courmont@nokia.com> | 2008-12-17 18:47:48 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-12-17 18:47:48 -0500 |
commit | 57c81fffc863fb4c1804bc963bcbfb82d736c6df (patch) | |
tree | 2b30247417b6656f557f34831a113a7ec1d531f2 /net/core | |
parent | 2d91d78b68606ff7ce52ea70e187dee7831aa2f6 (diff) |
Phonet: allocate separate ARP type for GPRS over a Phonet pipe
A separate xmit lock class supports GPRS over a Phonet pipe over a TUN
device (type ARPHRD_NONE).
Signed-off-by: Rémi Denis-Courmont <remi.denis-courmont@nokia.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/core')
-rw-r--r-- | net/core/dev.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/core/dev.c b/net/core/dev.c index 15aab0c46d6d..048cf1197872 100644 --- a/net/core/dev.c +++ b/net/core/dev.c | |||
@@ -284,7 +284,7 @@ static const unsigned short netdev_lock_type[] = | |||
284 | ARPHRD_IRDA, ARPHRD_FCPP, ARPHRD_FCAL, ARPHRD_FCPL, | 284 | ARPHRD_IRDA, ARPHRD_FCPP, ARPHRD_FCAL, ARPHRD_FCPL, |
285 | ARPHRD_FCFABRIC, ARPHRD_IEEE802_TR, ARPHRD_IEEE80211, | 285 | ARPHRD_FCFABRIC, ARPHRD_IEEE802_TR, ARPHRD_IEEE80211, |
286 | ARPHRD_IEEE80211_PRISM, ARPHRD_IEEE80211_RADIOTAP, ARPHRD_PHONET, | 286 | ARPHRD_IEEE80211_PRISM, ARPHRD_IEEE80211_RADIOTAP, ARPHRD_PHONET, |
287 | ARPHRD_VOID, ARPHRD_NONE}; | 287 | ARPHRD_PHONET_PIPE, ARPHRD_VOID, ARPHRD_NONE}; |
288 | 288 | ||
289 | static const char *netdev_lock_name[] = | 289 | static const char *netdev_lock_name[] = |
290 | {"_xmit_NETROM", "_xmit_ETHER", "_xmit_EETHER", "_xmit_AX25", | 290 | {"_xmit_NETROM", "_xmit_ETHER", "_xmit_EETHER", "_xmit_AX25", |
@@ -301,7 +301,7 @@ static const char *netdev_lock_name[] = | |||
301 | "_xmit_IRDA", "_xmit_FCPP", "_xmit_FCAL", "_xmit_FCPL", | 301 | "_xmit_IRDA", "_xmit_FCPP", "_xmit_FCAL", "_xmit_FCPL", |
302 | "_xmit_FCFABRIC", "_xmit_IEEE802_TR", "_xmit_IEEE80211", | 302 | "_xmit_FCFABRIC", "_xmit_IEEE802_TR", "_xmit_IEEE80211", |
303 | "_xmit_IEEE80211_PRISM", "_xmit_IEEE80211_RADIOTAP", "_xmit_PHONET", | 303 | "_xmit_IEEE80211_PRISM", "_xmit_IEEE80211_RADIOTAP", "_xmit_PHONET", |
304 | "_xmit_VOID", "_xmit_NONE"}; | 304 | "_xmit_PHONET_PIPE", "_xmit_VOID", "_xmit_NONE"}; |
305 | 305 | ||
306 | static struct lock_class_key netdev_xmit_lock_key[ARRAY_SIZE(netdev_lock_type)]; | 306 | static struct lock_class_key netdev_xmit_lock_key[ARRAY_SIZE(netdev_lock_type)]; |
307 | static struct lock_class_key netdev_addr_lock_key[ARRAY_SIZE(netdev_lock_type)]; | 307 | static struct lock_class_key netdev_addr_lock_key[ARRAY_SIZE(netdev_lock_type)]; |