diff options
author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
---|---|---|
committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /drivers/net/appletalk | |
parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'drivers/net/appletalk')
-rw-r--r-- | drivers/net/appletalk/Kconfig | 2 | ||||
-rw-r--r-- | drivers/net/appletalk/ipddp.c | 10 | ||||
-rw-r--r-- | drivers/net/appletalk/ltpc.c | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/drivers/net/appletalk/Kconfig b/drivers/net/appletalk/Kconfig index 0a0e0cd81a23..f5a89164e779 100644 --- a/drivers/net/appletalk/Kconfig +++ b/drivers/net/appletalk/Kconfig | |||
@@ -18,7 +18,7 @@ config ATALK | |||
18 | 18 | ||
19 | General information about how to connect Linux, Windows machines and | 19 | General information about how to connect Linux, Windows machines and |
20 | Macs is on the WWW at <http://www.eats.com/linux_mac_win.html>. The | 20 | Macs is on the WWW at <http://www.eats.com/linux_mac_win.html>. The |
21 | NET-3-HOWTO, available from | 21 | NET3-4-HOWTO, available from |
22 | <http://www.tldp.org/docs.html#howto>, contains valuable | 22 | <http://www.tldp.org/docs.html#howto>, contains valuable |
23 | information as well. | 23 | information as well. |
24 | 24 | ||
diff --git a/drivers/net/appletalk/ipddp.c b/drivers/net/appletalk/ipddp.c index 0362c8d31a08..10d0dba572c2 100644 --- a/drivers/net/appletalk/ipddp.c +++ b/drivers/net/appletalk/ipddp.c | |||
@@ -244,7 +244,7 @@ static int ipddp_delete(struct ipddp_route *rt) | |||
244 | } | 244 | } |
245 | 245 | ||
246 | spin_unlock_bh(&ipddp_route_lock); | 246 | spin_unlock_bh(&ipddp_route_lock); |
247 | return (-ENOENT); | 247 | return -ENOENT; |
248 | } | 248 | } |
249 | 249 | ||
250 | /* | 250 | /* |
@@ -259,10 +259,10 @@ static struct ipddp_route* __ipddp_find_route(struct ipddp_route *rt) | |||
259 | if(f->ip == rt->ip && | 259 | if(f->ip == rt->ip && |
260 | f->at.s_net == rt->at.s_net && | 260 | f->at.s_net == rt->at.s_net && |
261 | f->at.s_node == rt->at.s_node) | 261 | f->at.s_node == rt->at.s_node) |
262 | return (f); | 262 | return f; |
263 | } | 263 | } |
264 | 264 | ||
265 | return (NULL); | 265 | return NULL; |
266 | } | 266 | } |
267 | 267 | ||
268 | static int ipddp_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) | 268 | static int ipddp_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) |
@@ -279,7 +279,7 @@ static int ipddp_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) | |||
279 | switch(cmd) | 279 | switch(cmd) |
280 | { | 280 | { |
281 | case SIOCADDIPDDPRT: | 281 | case SIOCADDIPDDPRT: |
282 | return (ipddp_create(&rcp)); | 282 | return ipddp_create(&rcp); |
283 | 283 | ||
284 | case SIOCFINDIPDDPRT: | 284 | case SIOCFINDIPDDPRT: |
285 | spin_lock_bh(&ipddp_route_lock); | 285 | spin_lock_bh(&ipddp_route_lock); |
@@ -297,7 +297,7 @@ static int ipddp_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) | |||
297 | return -ENOENT; | 297 | return -ENOENT; |
298 | 298 | ||
299 | case SIOCDELIPDDPRT: | 299 | case SIOCDELIPDDPRT: |
300 | return (ipddp_delete(&rcp)); | 300 | return ipddp_delete(&rcp); |
301 | 301 | ||
302 | default: | 302 | default: |
303 | return -EINVAL; | 303 | return -EINVAL; |
diff --git a/drivers/net/appletalk/ltpc.c b/drivers/net/appletalk/ltpc.c index adc07551739e..e69eead12ec7 100644 --- a/drivers/net/appletalk/ltpc.c +++ b/drivers/net/appletalk/ltpc.c | |||
@@ -727,7 +727,7 @@ static int sendup_buffer (struct net_device *dev) | |||
727 | 727 | ||
728 | if (ltc->command != LT_RCVLAP) { | 728 | if (ltc->command != LT_RCVLAP) { |
729 | printk("unknown command 0x%02x from ltpc card\n",ltc->command); | 729 | printk("unknown command 0x%02x from ltpc card\n",ltc->command); |
730 | return(-1); | 730 | return -1; |
731 | } | 731 | } |
732 | dnode = ltc->dnode; | 732 | dnode = ltc->dnode; |
733 | snode = ltc->snode; | 733 | snode = ltc->snode; |