o NET: move net/core/dv.c EXPORT_SYMBOLs from net/netsyms.c

diff --git a/net/core/dv.c b/net/core/dv.c
index e7de41f94f9c36946ded378c10ce809ae6a654b8..999eac94d5c13b87564309c9c5410fa332337749 100644 (file)
--- a/net/core/dv.c
+++ b/net/core/dv.c
@@ -10,6 +10,7 @@
  *             Dave Miller:    improvement on the code (correctness, performance and source files)
  *
  */
+#include <linux/module.h>
 #include <linux/types.h>
 #include <linux/kernel.h>
 #include <linux/sched.h>
@@ -237,7 +238,7 @@ int divert_ioctl(unsigned int cmd, struct divert_cf *arg)
 
                default:
                        return -EINVAL;
-               };
+               }
 
                break;
 
@@ -281,7 +282,7 @@ int divert_ioctl(unsigned int cmd, struct divert_cf *arg)
 
                        default:
                                return -EINVAL;
-                       };
+                       }
 
                        break;
 
@@ -301,7 +302,7 @@ int divert_ioctl(unsigned int cmd, struct divert_cf *arg)
 
                        default:
                                return -EINVAL;
-                       };
+                       }
 
                        break;
 
@@ -321,7 +322,7 @@ int divert_ioctl(unsigned int cmd, struct divert_cf *arg)
 
                        default:
                                return -EINVAL;
-                       };
+                       }
 
                        break;
 
@@ -337,7 +338,7 @@ int divert_ioctl(unsigned int cmd, struct divert_cf *arg)
 
                        default:
                                return -EINVAL;
-                       };
+                       }
 
                        break;
 
@@ -353,7 +354,7 @@ int divert_ioctl(unsigned int cmd, struct divert_cf *arg)
 
                        default:
                                return -EINVAL;
-                       };
+                       }
 
                        break;
 
@@ -373,7 +374,7 @@ int divert_ioctl(unsigned int cmd, struct divert_cf *arg)
 
                        default:
                                return -EINVAL;
-                       };
+                       }
 
                        break;
 
@@ -389,7 +390,7 @@ int divert_ioctl(unsigned int cmd, struct divert_cf *arg)
 
                        default:
                                return -EINVAL;
-                       };
+                       }
 
                        break;
 
@@ -405,7 +406,7 @@ int divert_ioctl(unsigned int cmd, struct divert_cf *arg)
 
                        default:
                                return -EINVAL;
-                       };
+                       }
 
                        break;
 
@@ -425,19 +426,19 @@ int divert_ioctl(unsigned int cmd, struct divert_cf *arg)
 
                        default:
                                return -EINVAL;
-                       };
+                       }
 
                        break;
 
                default:
                        return -EINVAL;
-               };
+               }
 
                break;
 
        default:
                return -EINVAL;
-       };
+       }
 
        return 0;
 }
@@ -550,8 +551,8 @@ void divert_frame(struct sk_buff *skb)
                        }
                }
                break;
-       };
-
-       return;
+       }
 }
 
+EXPORT_SYMBOL(alloc_divert_blk);
+EXPORT_SYMBOL(free_divert_blk);

diff --git a/net/netsyms.c b/net/netsyms.c
index 84ccf9121f34b80efebea00454560ba2485f7cec..dcc33c180acb09c58b0dac9746189d055143df0b 100644 (file)
--- a/net/netsyms.c
+++ b/net/netsyms.c
@@ -29,9 +29,6 @@
 #include <linux/if_bridge.h>
 #include <linux/if_vlan.h>
 #include <linux/random.h>
-#ifdef CONFIG_NET_DIVERT
-#include <linux/divert.h>
-#endif /* CONFIG_NET_DIVERT */
 
 #ifdef CONFIG_INET
 #include <net/protocol.h>
@@ -69,10 +66,6 @@ EXPORT_SYMBOL(make_EII_client);
 EXPORT_SYMBOL(destroy_EII_client);
 #endif
 
-#ifdef CONFIG_NET_DIVERT
-EXPORT_SYMBOL(alloc_divert_blk);
-EXPORT_SYMBOL(free_divert_blk);
-#endif /* CONFIG_NET_DIVERT */
 
 #ifdef CONFIG_INET
 /* Internet layer registration */