Patched in Tegra support.

1 files changed, 18 insertions, 78 deletions

diff --git a/net/bridge/br_private.h b/net/bridge/br_private.h
index 711094aed41..857a021deea 100644
--- a/net/bridge/br_private.h
+++ b/net/bridge/br_private.h
@@ -29,11 +29,6 @@
 
 #define BR_VERSION      "2.3"
 
-/* Control of forwarding link local multicast */
-#define BR_GROUPFWD_DEFAULT     0
-/* Don't allow forwarding control protocols like STP and LLDP */
-#define BR_GROUPFWD_RESTRICTED  0x4007u
-
 /* Path to usermode spanning tree program */
 #define BR_STP_PROG     "/sbin/bridge-stp"
 
@@ -56,7 +51,7 @@ struct br_ip
 {
         union {
                 __be32  ip4;
-#if IS_ENABLED(CONFIG_IPV6)
+#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
                 struct in6_addr ip6;
 #endif
         } u;
@@ -82,8 +77,9 @@ struct net_bridge_port_group {
         struct hlist_node               mglist;
         struct rcu_head                 rcu;
         struct timer_list               timer;
+        struct timer_list               query_timer;
         struct br_ip                    addr;
-        unsigned char                   state;
+        u32                             queries_sent;
 };
 
 struct net_bridge_mdb_entry
@@ -93,8 +89,10 @@ struct net_bridge_mdb_entry
         struct net_bridge_port_group __rcu *ports;
         struct rcu_head                 rcu;
         struct timer_list               timer;
+        struct timer_list               query_timer;
         struct br_ip                    addr;
         bool                            mglist;
+        u32                             queries_sent;
 };
 
 struct net_bridge_mdb_htable
@@ -136,9 +134,6 @@ struct net_bridge_port
 
         unsigned long                   flags;
 #define BR_HAIRPIN_MODE         0x00000001
-#define BR_BPDU_GUARD           0x00000002
-#define BR_ROOT_BLOCK           0x00000004
-#define BR_MULTICAST_FAST_LEAVE 0x00000008
 
 #ifdef CONFIG_BRIDGE_IGMP_SNOOPING
         u32                             multicast_startup_queries_sent;
@@ -162,9 +157,7 @@ struct net_bridge_port
 
 static inline struct net_bridge_port *br_port_get_rcu(const struct net_device *dev)
 {
-        struct net_bridge_port *port =
-                        rcu_dereference_rtnl(dev->rx_handler_data);
-
+        struct net_bridge_port *port = rcu_dereference(dev->rx_handler_data);
         return br_port_exists(dev) ? port : NULL;
 }
 
@@ -200,8 +193,6 @@ struct net_bridge
         unsigned long                   flags;
 #define BR_SET_MAC_ADDR         0x00000001
 
-        u16                             group_fwd_mask;
-
         /* STP */
         bridge_id                       designated_root;
         bridge_id                       bridge_id;
@@ -230,7 +221,6 @@ struct net_bridge
         unsigned char                   multicast_router;
 
         u8                              multicast_disabled:1;
-        u8                              multicast_querier:1;
 
         u32                             hash_elasticity;
         u32                             hash_max;
@@ -294,6 +284,7 @@ struct br_input_skb_cb {
         pr_debug("%s: " format,  (br)->dev->name, ##args)
 
 extern struct notifier_block br_device_notifier;
+extern const u8 br_group_address[ETH_ALEN];
 
 /* called under bridge lock */
 static inline int br_is_root_bridge(const struct net_bridge *br)
@@ -321,7 +312,7 @@ static inline void br_netpoll_send_skb(const struct net_bridge_port *p,
                 netpoll_send_skb(np, skb);
 }
 
-extern int br_netpoll_enable(struct net_bridge_port *p, gfp_t gfp);
+extern int br_netpoll_enable(struct net_bridge_port *p);
 extern void br_netpoll_disable(struct net_bridge_port *p);
 #else
 static inline struct netpoll_info *br_netpoll_info(struct net_bridge *br)
@@ -334,7 +325,7 @@ static inline void br_netpoll_send_skb(const struct net_bridge_port *p,
 {
 }
 
-static inline int br_netpoll_enable(struct net_bridge_port *p, gfp_t gfp)
+static inline int br_netpoll_enable(struct net_bridge_port *p)
 {
         return 0;
 }
@@ -350,7 +341,6 @@ extern void br_fdb_fini(void);
 extern void br_fdb_flush(struct net_bridge *br);
 extern void br_fdb_changeaddr(struct net_bridge_port *p,
                               const unsigned char *newaddr);
-extern void br_fdb_change_mac_address(struct net_bridge *br, const u8 *newaddr);
 extern void br_fdb_cleanup(unsigned long arg);
 extern void br_fdb_delete_by_port(struct net_bridge *br,
                                   const struct net_bridge_port *p, int do_all);
@@ -365,18 +355,9 @@ extern int br_fdb_insert(struct net_bridge *br,
 extern void br_fdb_update(struct net_bridge *br,
                           struct net_bridge_port *source,
                           const unsigned char *addr);
-
-extern int br_fdb_delete(struct ndmsg *ndm,
-                         struct net_device *dev,
-                         const unsigned char *addr);
-extern int br_fdb_add(struct ndmsg *nlh, struct nlattr *tb[],
-                      struct net_device *dev,
-                      const unsigned char *addr,
-                      u16 nlh_flags);
-extern int br_fdb_dump(struct sk_buff *skb,
-                       struct netlink_callback *cb,
-                       struct net_device *dev,
-                       int idx);
+extern int br_fdb_dump(struct sk_buff *skb, struct netlink_callback *cb);
+extern int br_fdb_add(struct sk_buff *skb, struct nlmsghdr *nlh, void *arg);
+extern int br_fdb_delete(struct sk_buff *skb, struct nlmsghdr *nlh, void *arg);
 
 /* br_forward.c */
 extern void br_deliver(const struct net_bridge_port *to,
@@ -399,8 +380,7 @@ extern int br_add_if(struct net_bridge *br,
 extern int br_del_if(struct net_bridge *br,
               struct net_device *dev);
 extern int br_min_mtu(const struct net_bridge *br);
-extern netdev_features_t br_features_recompute(struct net_bridge *br,
-        netdev_features_t features);
+extern u32 br_features_recompute(struct net_bridge *br, u32 features);
 
 /* br_input.c */
 extern int br_handle_frame_finish(struct sk_buff *skb);
@@ -412,7 +392,6 @@ extern int br_ioctl_deviceless_stub(struct net *net, unsigned int cmd, void __us
 
 /* br_multicast.c */
 #ifdef CONFIG_BRIDGE_IGMP_SNOOPING
-extern unsigned int br_mdb_rehash_seq;
 extern int br_multicast_rcv(struct net_bridge *br,
                             struct net_bridge_port *port,
                             struct sk_buff *skb);
@@ -433,36 +412,7 @@ extern int br_multicast_set_router(struct net_bridge *br, unsigned long val);
 extern int br_multicast_set_port_router(struct net_bridge_port *p,
                                         unsigned long val);
 extern int br_multicast_toggle(struct net_bridge *br, unsigned long val);
-extern int br_multicast_set_querier(struct net_bridge *br, unsigned long val);
 extern int br_multicast_set_hash_max(struct net_bridge *br, unsigned long val);
-extern struct net_bridge_mdb_entry *br_mdb_ip_get(
-                                struct net_bridge_mdb_htable *mdb,
-                                struct br_ip *dst);
-extern struct net_bridge_mdb_entry *br_multicast_new_group(struct net_bridge *br,
-                                struct net_bridge_port *port, struct br_ip *group);
-extern void br_multicast_free_pg(struct rcu_head *head);
-extern struct net_bridge_port_group *br_multicast_new_port_group(
-                                struct net_bridge_port *port,
-                                struct br_ip *group,
-                                struct net_bridge_port_group *next,
-                                unsigned char state);
-extern void br_mdb_init(void);
-extern void br_mdb_uninit(void);
-extern void br_mdb_notify(struct net_device *dev, struct net_bridge_port *port,
-                          struct br_ip *group, int type);
-
-#define mlock_dereference(X, br) \
-        rcu_dereference_protected(X, lockdep_is_held(&br->multicast_lock))
-
-#if IS_ENABLED(CONFIG_IPV6)
-#include <net/addrconf.h>
-static inline int ipv6_is_transient_multicast(const struct in6_addr *addr)
-{
-        if (ipv6_addr_is_multicast(addr) && IPV6_ADDR_MC_FLAG_TRANSIENT(addr))
-                return 1;
-        return 0;
-}
-#endif
 
 static inline bool br_multicast_is_router(struct net_bridge *br)
 {
@@ -526,12 +476,6 @@ static inline bool br_multicast_is_router(struct net_bridge *br)
 {
         return 0;
 }
-static inline void br_mdb_init(void)
-{
-}
-static inline void br_mdb_uninit(void)
-{
-}
 #endif
 
 /* br_netfilter.c */
@@ -584,18 +528,14 @@ extern void br_stp_port_timer_init(struct net_bridge_port *p);
 extern unsigned long br_timer_value(const struct timer_list *timer);
 
 /* br.c */
-#if IS_ENABLED(CONFIG_ATM_LANE)
+#if defined(CONFIG_ATM_LANE) || defined(CONFIG_ATM_LANE_MODULE)
 extern int (*br_fdb_test_addr_hook)(struct net_device *dev, unsigned char *addr);
 #endif
 
 /* br_netlink.c */
-extern struct rtnl_link_ops br_link_ops;
 extern int br_netlink_init(void);
 extern void br_netlink_fini(void);
 extern void br_ifinfo_notify(int event, struct net_bridge_port *port);
-extern int br_setlink(struct net_device *dev, struct nlmsghdr *nlmsg);
-extern int br_getlink(struct sk_buff *skb, u32 pid, u32 seq,
-                      struct net_device *dev);
 
 #ifdef CONFIG_SYSFS
 /* br_sysfs_if.c */
@@ -609,10 +549,10 @@ extern void br_sysfs_delbr(struct net_device *dev);
 
 #else
 
-static inline int br_sysfs_addif(struct net_bridge_port *p) { return 0; }
-static inline int br_sysfs_renameif(struct net_bridge_port *p) { return 0; }
-static inline int br_sysfs_addbr(struct net_device *dev) { return 0; }
-static inline void br_sysfs_delbr(struct net_device *dev) { return; }
+#define br_sysfs_addif(p)       (0)
+#define br_sysfs_renameif(p)    (0)
+#define br_sysfs_addbr(dev)     (0)
+#define br_sysfs_delbr(dev)     do { } while(0)
 #endif /* CONFIG_SYSFS */
 
 #endif