diff options
| author | Anton Altaparmakov <aia21@cantab.net> | 2006-03-23 14:50:51 +0000 |
|---|---|---|
| committer | Anton Altaparmakov <aia21@cantab.net> | 2006-03-23 14:50:51 +0000 |
| commit | b4d8d1a93c6ea042b29bb66fbb1cf6bc556c18f7 (patch) | |
| tree | 030ef62361042d1a034087ad9a726db3b57bba72 /net/tipc/eth_media.c | |
| parent | bb8047d3540affd6b8c2adac3fe792e07143be0f (diff) | |
| parent | 2e6e33bab6e1996a5dec9108fb467b52b841e7a8 (diff) | |
Merge branch 'master' of /usr/src/ntfs-2.6/
Diffstat (limited to 'net/tipc/eth_media.c')
| -rw-r--r-- | net/tipc/eth_media.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/tipc/eth_media.c b/net/tipc/eth_media.c index 1f8d83b9c8b..7a252785f72 100644 --- a/net/tipc/eth_media.c +++ b/net/tipc/eth_media.c @@ -169,7 +169,7 @@ static int enable_bearer(struct tipc_bearer *tb_ptr) static void disable_bearer(struct tipc_bearer *tb_ptr) { - ((struct eth_bearer *)tb_ptr->usr_handle)->bearer = 0; + ((struct eth_bearer *)tb_ptr->usr_handle)->bearer = NULL; } /** @@ -285,7 +285,7 @@ void tipc_eth_media_stop(void) for (i = 0; i < MAX_ETH_BEARERS ; i++) { if (eth_bearers[i].bearer) { eth_bearers[i].bearer->blocked = 1; - eth_bearers[i].bearer = 0; + eth_bearers[i].bearer = NULL; } if (eth_bearers[i].dev) { dev_remove_pack(ð_bearers[i].tipc_packet_type); |