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 /net/rose/rose_link.c | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'net/rose/rose_link.c')
| -rw-r--r-- | net/rose/rose_link.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/rose/rose_link.c b/net/rose/rose_link.c index a750a28e0221..fa5f5641a2c2 100644 --- a/net/rose/rose_link.c +++ b/net/rose/rose_link.c | |||
| @@ -114,7 +114,7 @@ static int rose_send_frame(struct sk_buff *skb, struct rose_neigh *neigh) | |||
| 114 | if (ax25s) | 114 | if (ax25s) |
| 115 | ax25_cb_put(ax25s); | 115 | ax25_cb_put(ax25s); |
| 116 | 116 | ||
| 117 | return (neigh->ax25 != NULL); | 117 | return neigh->ax25 != NULL; |
| 118 | } | 118 | } |
| 119 | 119 | ||
| 120 | /* | 120 | /* |
| @@ -137,7 +137,7 @@ static int rose_link_up(struct rose_neigh *neigh) | |||
| 137 | if (ax25s) | 137 | if (ax25s) |
| 138 | ax25_cb_put(ax25s); | 138 | ax25_cb_put(ax25s); |
| 139 | 139 | ||
| 140 | return (neigh->ax25 != NULL); | 140 | return neigh->ax25 != NULL; |
| 141 | } | 141 | } |
| 142 | 142 | ||
| 143 | /* | 143 | /* |