Merge remote-tracking branch 'net-next/master'

[karo-tx-linux.git] / include / net / garp.h

diff --git a/include/net/garp.h b/include/net/garp.h
index 834d8add9e5fd51112f08cde966e0044604049cb..abf33bbd2e6a0413193769d353bb9ce82a10ebec 100644 (file)
--- a/include/net/garp.h
+++ b/include/net/garp.h
@@ -112,19 +112,18 @@ struct garp_port {
        struct rcu_head                 rcu;
 };
 
-extern int     garp_register_application(struct garp_application *app);
-extern void    garp_unregister_application(struct garp_application *app);
-
-extern int     garp_init_applicant(struct net_device *dev,
-                                   struct garp_application *app);
-extern void    garp_uninit_applicant(struct net_device *dev,
-                                     struct garp_application *app);
-
-extern int     garp_request_join(const struct net_device *dev,
-                                 const struct garp_application *app,
-                                 const void *data, u8 len, u8 type);
-extern void    garp_request_leave(const struct net_device *dev,
-                                  const struct garp_application *app,
-                                  const void *data, u8 len, u8 type);
+int garp_register_application(struct garp_application *app);
+void garp_unregister_application(struct garp_application *app);
+
+int garp_init_applicant(struct net_device *dev, struct garp_application *app);
+void garp_uninit_applicant(struct net_device *dev,
+                          struct garp_application *app);
+
+int garp_request_join(const struct net_device *dev,
+                     const struct garp_application *app, const void *data,
+                     u8 len, u8 type);
+void garp_request_leave(const struct net_device *dev,
+                       const struct garp_application *app,
+                       const void *data, u8 len, u8 type);
 
 #endif /* _NET_GARP_H */