Merge branch 'misc' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc...

[linux-2.6] / net / tipc / eth_media.c

diff --git a/net/tipc/eth_media.c b/net/tipc/eth_media.c
index 64a880b5935a7243d0ed8df8c4d72614d8d502d6..7a252785f727c47e140ccfe6bd67877d38371365 100644 (file)
--- a/net/tipc/eth_media.c
+++ b/net/tipc/eth_media.c
@@ -38,7 +38,6 @@
 #include <net/tipc/tipc_bearer.h>
 #include <net/tipc/tipc_msg.h>
 #include <linux/netdevice.h>
-#include <linux/version.h>
 
 #define MAX_ETH_BEARERS                2
 #define ETH_LINK_PRIORITY      TIPC_DEF_LINK_PRI
@@ -170,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;
 }
 
 /**
@@ -239,13 +238,13 @@ static char *eth_addr2str(struct tipc_media_addr *a, char *str_buf, int str_size
 }
 
 /**
- * eth_media_start - activate Ethernet bearer support
+ * tipc_eth_media_start - activate Ethernet bearer support
  *
  * Register Ethernet media type with TIPC bearer code.  Also register
  * with OS for notifications about device state changes.
  */
 
-int eth_media_start(void)
+int tipc_eth_media_start(void)
 {                       
        struct tipc_media_addr bcast_addr;
        int res;
@@ -272,10 +271,10 @@ int eth_media_start(void)
 }
 
 /**
- * eth_media_stop - deactivate Ethernet bearer support
+ * tipc_eth_media_stop - deactivate Ethernet bearer support
  */
 
-void eth_media_stop(void)
+void tipc_eth_media_stop(void)
 {
        int i;
 
@@ -286,7 +285,7 @@ void 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(&eth_bearers[i].tipc_packet_type);