diff options
| author | Steve French <sfrench@us.ibm.com> | 2012-01-14 00:59:13 -0500 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2012-01-14 00:59:13 -0500 |
| commit | dcd169b761d52e3f9122e30442b83863bdf1d9d9 (patch) | |
| tree | 5e79741f1865a3aef840e68d7db9e7ed4d685b5a /net/tipc/core.c | |
| parent | aaf015890754d58dcb71a4aa44ed246bb082bcf6 (diff) | |
| parent | 7250170c9ed00f3b74b11b98afefab45020672dd (diff) | |
Merge branch 'master' of git+ssh://git.samba.org/data/git/sfrench/cifs-2.6
Diffstat (limited to 'net/tipc/core.c')
| -rw-r--r-- | net/tipc/core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/tipc/core.c b/net/tipc/core.c index c21331d58fdb..2691cd57b8a8 100644 --- a/net/tipc/core.c +++ b/net/tipc/core.c | |||
| @@ -99,8 +99,8 @@ struct sk_buff *tipc_buf_acquire(u32 size) | |||
| 99 | 99 | ||
| 100 | static void tipc_core_stop_net(void) | 100 | static void tipc_core_stop_net(void) |
| 101 | { | 101 | { |
| 102 | tipc_eth_media_stop(); | ||
| 103 | tipc_net_stop(); | 102 | tipc_net_stop(); |
| 103 | tipc_eth_media_stop(); | ||
| 104 | } | 104 | } |
| 105 | 105 | ||
| 106 | /** | 106 | /** |