diff options
author | Jonathan Herman <hermanjl@cs.unc.edu> | 2013-01-17 16:15:55 -0500 |
---|---|---|
committer | Jonathan Herman <hermanjl@cs.unc.edu> | 2013-01-17 16:15:55 -0500 |
commit | 8dea78da5cee153b8af9c07a2745f6c55057fe12 (patch) | |
tree | a8f4d49d63b1ecc92f2fddceba0655b2472c5bd9 /net/decnet/af_decnet.c | |
parent | 406089d01562f1e2bf9f089fd7637009ebaad589 (diff) |
Patched in Tegra support.
Diffstat (limited to 'net/decnet/af_decnet.c')
-rw-r--r-- | net/decnet/af_decnet.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/net/decnet/af_decnet.c b/net/decnet/af_decnet.c index 307c322d53b..19acd00a638 100644 --- a/net/decnet/af_decnet.c +++ b/net/decnet/af_decnet.c | |||
@@ -119,6 +119,7 @@ Version 0.0.6 2.1.110 07-aug-98 Eduardo Marcelo Serrat | |||
119 | #include <net/sock.h> | 119 | #include <net/sock.h> |
120 | #include <net/tcp_states.h> | 120 | #include <net/tcp_states.h> |
121 | #include <net/flow.h> | 121 | #include <net/flow.h> |
122 | #include <asm/system.h> | ||
122 | #include <asm/ioctls.h> | 123 | #include <asm/ioctls.h> |
123 | #include <linux/capability.h> | 124 | #include <linux/capability.h> |
124 | #include <linux/mm.h> | 125 | #include <linux/mm.h> |
@@ -250,7 +251,7 @@ static void dn_unhash_sock_bh(struct sock *sk) | |||
250 | static struct hlist_head *listen_hash(struct sockaddr_dn *addr) | 251 | static struct hlist_head *listen_hash(struct sockaddr_dn *addr) |
251 | { | 252 | { |
252 | int i; | 253 | int i; |
253 | unsigned int hash = addr->sdn_objnum; | 254 | unsigned hash = addr->sdn_objnum; |
254 | 255 | ||
255 | if (hash == 0) { | 256 | if (hash == 0) { |
256 | hash = addr->sdn_objnamel; | 257 | hash = addr->sdn_objnamel; |
@@ -1313,10 +1314,10 @@ static int dn_shutdown(struct socket *sock, int how) | |||
1313 | if (scp->state == DN_O) | 1314 | if (scp->state == DN_O) |
1314 | goto out; | 1315 | goto out; |
1315 | 1316 | ||
1316 | if (how != SHUT_RDWR) | 1317 | if (how != SHUTDOWN_MASK) |
1317 | goto out; | 1318 | goto out; |
1318 | 1319 | ||
1319 | sk->sk_shutdown = SHUTDOWN_MASK; | 1320 | sk->sk_shutdown = how; |
1320 | dn_destroy_sock(sk); | 1321 | dn_destroy_sock(sk); |
1321 | err = 0; | 1322 | err = 0; |
1322 | 1323 | ||
@@ -1844,9 +1845,9 @@ static inline int dn_queue_too_long(struct dn_scp *scp, struct sk_buff_head *que | |||
1844 | * inclusion (or not) of the two 16 bit acknowledgement fields so it doesn't | 1845 | * inclusion (or not) of the two 16 bit acknowledgement fields so it doesn't |
1845 | * make much practical difference. | 1846 | * make much practical difference. |
1846 | */ | 1847 | */ |
1847 | unsigned int dn_mss_from_pmtu(struct net_device *dev, int mtu) | 1848 | unsigned dn_mss_from_pmtu(struct net_device *dev, int mtu) |
1848 | { | 1849 | { |
1849 | unsigned int mss = 230 - DN_MAX_NSP_DATA_HEADER; | 1850 | unsigned mss = 230 - DN_MAX_NSP_DATA_HEADER; |
1850 | if (dev) { | 1851 | if (dev) { |
1851 | struct dn_dev *dn_db = rcu_dereference_raw(dev->dn_ptr); | 1852 | struct dn_dev *dn_db = rcu_dereference_raw(dev->dn_ptr); |
1852 | mtu -= LL_RESERVED_SPACE(dev); | 1853 | mtu -= LL_RESERVED_SPACE(dev); |