diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2018-10-25 13:30:25 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2018-10-25 13:30:25 -0700 |
| commit | 0fd6f3e2ecac1dd932fdda74b1bbe8cb6cad52b4 (patch) | |
| tree | f80ba51987ad805119307911213c13dcc55cc5ce /include/net | |
| parent | a36b6328efdd11fb4002ea0427c95e3cf0e4fd20 (diff) | |
| parent | 392854fb08079416d260c2c5ba6369391eda11d3 (diff) | |
Merge "Merge android-4.4.162 (3eb8e73) into msm-4.4"
Diffstat (limited to 'include/net')
| -rw-r--r-- | include/net/bonding.h | 7 | ||||
| -rw-r--r-- | include/net/ip_fib.h | 1 |
2 files changed, 2 insertions, 6 deletions
diff --git a/include/net/bonding.h b/include/net/bonding.h index 93abe5f6188d..d5abd3a80896 100644 --- a/include/net/bonding.h +++ b/include/net/bonding.h @@ -146,12 +146,6 @@ struct bond_parm_tbl { int mode; }; -struct netdev_notify_work { - struct delayed_work work; - struct net_device *dev; - struct netdev_bonding_info bonding_info; -}; - struct slave { struct net_device *dev; /* first - useful for panic debug */ struct bonding *bond; /* our master */ @@ -177,6 +171,7 @@ struct slave { #ifdef CONFIG_NET_POLL_CONTROLLER struct netpoll *np; #endif + struct delayed_work notify_work; struct kobject kobj; struct rtnl_link_stats64 slave_stats; }; diff --git a/include/net/ip_fib.h b/include/net/ip_fib.h index 3afb7c4c7098..2a25b53cd427 100644 --- a/include/net/ip_fib.h +++ b/include/net/ip_fib.h @@ -322,6 +322,7 @@ int ip_fib_check_default(__be32 gw, struct net_device *dev); int fib_sync_down_dev(struct net_device *dev, unsigned long event, bool force); int fib_sync_down_addr(struct net *net, __be32 local); int fib_sync_up(struct net_device *dev, unsigned int nh_flags); +void fib_sync_mtu(struct net_device *dev, u32 orig_mtu); extern u32 fib_multipath_secret __read_mostly; |