|
@@ -454,7 +454,7 @@ int bond_dev_queue_xmit(struct bonding *bond, struct sk_buff *skb, struct net_de
|
|
|
*/
|
|
|
static void bond_vlan_rx_register(struct net_device *bond_dev, struct vlan_group *grp)
|
|
|
{
|
|
|
- struct bonding *bond = bond_dev->priv;
|
|
|
+ struct bonding *bond = netdev_priv(bond_dev);
|
|
|
struct slave *slave;
|
|
|
int i;
|
|
|
|
|
@@ -477,7 +477,7 @@ static void bond_vlan_rx_register(struct net_device *bond_dev, struct vlan_group
|
|
|
*/
|
|
|
static void bond_vlan_rx_add_vid(struct net_device *bond_dev, uint16_t vid)
|
|
|
{
|
|
|
- struct bonding *bond = bond_dev->priv;
|
|
|
+ struct bonding *bond = netdev_priv(bond_dev);
|
|
|
struct slave *slave;
|
|
|
int i, res;
|
|
|
|
|
@@ -505,7 +505,7 @@ static void bond_vlan_rx_add_vid(struct net_device *bond_dev, uint16_t vid)
|
|
|
*/
|
|
|
static void bond_vlan_rx_kill_vid(struct net_device *bond_dev, uint16_t vid)
|
|
|
{
|
|
|
- struct bonding *bond = bond_dev->priv;
|
|
|
+ struct bonding *bond = netdev_priv(bond_dev);
|
|
|
struct slave *slave;
|
|
|
struct net_device *vlan_dev;
|
|
|
int i, res;
|
|
@@ -939,7 +939,7 @@ static int bond_mc_list_copy(struct dev_mc_list *mc_list, struct bonding *bond,
|
|
|
*/
|
|
|
static void bond_mc_list_flush(struct net_device *bond_dev, struct net_device *slave_dev)
|
|
|
{
|
|
|
- struct bonding *bond = bond_dev->priv;
|
|
|
+ struct bonding *bond = netdev_priv(bond_dev);
|
|
|
struct dev_mc_list *dmi;
|
|
|
|
|
|
for (dmi = bond_dev->mc_list; dmi; dmi = dmi->next) {
|
|
@@ -1383,7 +1383,7 @@ done:
|
|
|
static void bond_setup_by_slave(struct net_device *bond_dev,
|
|
|
struct net_device *slave_dev)
|
|
|
{
|
|
|
- struct bonding *bond = bond_dev->priv;
|
|
|
+ struct bonding *bond = netdev_priv(bond_dev);
|
|
|
|
|
|
bond_dev->neigh_setup = slave_dev->neigh_setup;
|
|
|
bond_dev->header_ops = slave_dev->header_ops;
|
|
@@ -1400,7 +1400,7 @@ static void bond_setup_by_slave(struct net_device *bond_dev,
|
|
|
/* enslave device <slave> to bond device <master> */
|
|
|
int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev)
|
|
|
{
|
|
|
- struct bonding *bond = bond_dev->priv;
|
|
|
+ struct bonding *bond = netdev_priv(bond_dev);
|
|
|
struct slave *new_slave = NULL;
|
|
|
struct dev_mc_list *dmi;
|
|
|
struct sockaddr addr;
|
|
@@ -1802,7 +1802,7 @@ err_undo_flags:
|
|
|
*/
|
|
|
int bond_release(struct net_device *bond_dev, struct net_device *slave_dev)
|
|
|
{
|
|
|
- struct bonding *bond = bond_dev->priv;
|
|
|
+ struct bonding *bond = netdev_priv(bond_dev);
|
|
|
struct slave *slave, *oldcurrent;
|
|
|
struct sockaddr addr;
|
|
|
int mac_addr_differ;
|
|
@@ -2013,7 +2013,7 @@ static void bond_destructor(struct net_device *bond_dev)
|
|
|
*/
|
|
|
int bond_release_and_destroy(struct net_device *bond_dev, struct net_device *slave_dev)
|
|
|
{
|
|
|
- struct bonding *bond = bond_dev->priv;
|
|
|
+ struct bonding *bond = netdev_priv(bond_dev);
|
|
|
int ret;
|
|
|
|
|
|
ret = bond_release(bond_dev, slave_dev);
|
|
@@ -2030,7 +2030,7 @@ int bond_release_and_destroy(struct net_device *bond_dev, struct net_device *sl
|
|
|
*/
|
|
|
static int bond_release_all(struct net_device *bond_dev)
|
|
|
{
|
|
|
- struct bonding *bond = bond_dev->priv;
|
|
|
+ struct bonding *bond = netdev_priv(bond_dev);
|
|
|
struct slave *slave;
|
|
|
struct net_device *slave_dev;
|
|
|
struct sockaddr addr;
|
|
@@ -2161,7 +2161,7 @@ out:
|
|
|
*/
|
|
|
static int bond_ioctl_change_active(struct net_device *bond_dev, struct net_device *slave_dev)
|
|
|
{
|
|
|
- struct bonding *bond = bond_dev->priv;
|
|
|
+ struct bonding *bond = netdev_priv(bond_dev);
|
|
|
struct slave *old_active = NULL;
|
|
|
struct slave *new_active = NULL;
|
|
|
int res = 0;
|
|
@@ -2210,7 +2210,7 @@ static int bond_ioctl_change_active(struct net_device *bond_dev, struct net_devi
|
|
|
|
|
|
static int bond_info_query(struct net_device *bond_dev, struct ifbond *info)
|
|
|
{
|
|
|
- struct bonding *bond = bond_dev->priv;
|
|
|
+ struct bonding *bond = netdev_priv(bond_dev);
|
|
|
|
|
|
info->bond_mode = bond->params.mode;
|
|
|
info->miimon = bond->params.miimon;
|
|
@@ -2224,7 +2224,7 @@ static int bond_info_query(struct net_device *bond_dev, struct ifbond *info)
|
|
|
|
|
|
static int bond_slave_info_query(struct net_device *bond_dev, struct ifslave *info)
|
|
|
{
|
|
|
- struct bonding *bond = bond_dev->priv;
|
|
|
+ struct bonding *bond = netdev_priv(bond_dev);
|
|
|
struct slave *slave;
|
|
|
int i, found = 0;
|
|
|
|
|
@@ -2717,7 +2717,7 @@ static int bond_arp_rcv(struct sk_buff *skb, struct net_device *dev, struct pack
|
|
|
if (!(dev->priv_flags & IFF_BONDING) || !(dev->flags & IFF_MASTER))
|
|
|
goto out;
|
|
|
|
|
|
- bond = dev->priv;
|
|
|
+ bond = netdev_priv(dev);
|
|
|
read_lock(&bond->lock);
|
|
|
|
|
|
dprintk("bond_arp_rcv: bond %s skb->dev %s orig_dev %s\n",
|
|
@@ -3526,7 +3526,7 @@ static int bond_event_changename(struct bonding *bond)
|
|
|
|
|
|
static int bond_master_netdev_event(unsigned long event, struct net_device *bond_dev)
|
|
|
{
|
|
|
- struct bonding *event_bond = bond_dev->priv;
|
|
|
+ struct bonding *event_bond = netdev_priv(bond_dev);
|
|
|
|
|
|
switch (event) {
|
|
|
case NETDEV_CHANGENAME:
|
|
@@ -3544,7 +3544,7 @@ static int bond_master_netdev_event(unsigned long event, struct net_device *bond
|
|
|
static int bond_slave_netdev_event(unsigned long event, struct net_device *slave_dev)
|
|
|
{
|
|
|
struct net_device *bond_dev = slave_dev->master;
|
|
|
- struct bonding *bond = bond_dev->priv;
|
|
|
+ struct bonding *bond = netdev_priv(bond_dev);
|
|
|
|
|
|
switch (event) {
|
|
|
case NETDEV_UNREGISTER:
|
|
@@ -3795,7 +3795,7 @@ static int bond_xmit_hash_policy_l2(struct sk_buff *skb,
|
|
|
|
|
|
static int bond_open(struct net_device *bond_dev)
|
|
|
{
|
|
|
- struct bonding *bond = bond_dev->priv;
|
|
|
+ struct bonding *bond = netdev_priv(bond_dev);
|
|
|
|
|
|
bond->kill_timers = 0;
|
|
|
|
|
@@ -3844,7 +3844,7 @@ static int bond_open(struct net_device *bond_dev)
|
|
|
|
|
|
static int bond_close(struct net_device *bond_dev)
|
|
|
{
|
|
|
- struct bonding *bond = bond_dev->priv;
|
|
|
+ struct bonding *bond = netdev_priv(bond_dev);
|
|
|
|
|
|
if (bond->params.mode == BOND_MODE_8023AD) {
|
|
|
/* Unregister the receive of LACPDUs */
|
|
@@ -3898,7 +3898,7 @@ static int bond_close(struct net_device *bond_dev)
|
|
|
|
|
|
static struct net_device_stats *bond_get_stats(struct net_device *bond_dev)
|
|
|
{
|
|
|
- struct bonding *bond = bond_dev->priv;
|
|
|
+ struct bonding *bond = netdev_priv(bond_dev);
|
|
|
struct net_device_stats *stats = &(bond->stats), *sstats;
|
|
|
struct net_device_stats local_stats;
|
|
|
struct slave *slave;
|
|
@@ -3976,7 +3976,7 @@ static int bond_do_ioctl(struct net_device *bond_dev, struct ifreq *ifr, int cmd
|
|
|
}
|
|
|
|
|
|
if (mii->reg_num == 1) {
|
|
|
- struct bonding *bond = bond_dev->priv;
|
|
|
+ struct bonding *bond = netdev_priv(bond_dev);
|
|
|
mii->val_out = 0;
|
|
|
read_lock(&bond->lock);
|
|
|
read_lock(&bond->curr_slave_lock);
|
|
@@ -4068,7 +4068,7 @@ static int bond_do_ioctl(struct net_device *bond_dev, struct ifreq *ifr, int cmd
|
|
|
|
|
|
static void bond_set_multicast_list(struct net_device *bond_dev)
|
|
|
{
|
|
|
- struct bonding *bond = bond_dev->priv;
|
|
|
+ struct bonding *bond = netdev_priv(bond_dev);
|
|
|
struct dev_mc_list *dmi;
|
|
|
|
|
|
/*
|
|
@@ -4129,7 +4129,7 @@ static void bond_set_multicast_list(struct net_device *bond_dev)
|
|
|
*/
|
|
|
static int bond_change_mtu(struct net_device *bond_dev, int new_mtu)
|
|
|
{
|
|
|
- struct bonding *bond = bond_dev->priv;
|
|
|
+ struct bonding *bond = netdev_priv(bond_dev);
|
|
|
struct slave *slave, *stop_at;
|
|
|
int res = 0;
|
|
|
int i;
|
|
@@ -4201,7 +4201,7 @@ unwind:
|
|
|
*/
|
|
|
static int bond_set_mac_address(struct net_device *bond_dev, void *addr)
|
|
|
{
|
|
|
- struct bonding *bond = bond_dev->priv;
|
|
|
+ struct bonding *bond = netdev_priv(bond_dev);
|
|
|
struct sockaddr *sa = addr, tmp_sa;
|
|
|
struct slave *slave, *stop_at;
|
|
|
int res = 0;
|
|
@@ -4282,7 +4282,7 @@ unwind:
|
|
|
|
|
|
static int bond_xmit_roundrobin(struct sk_buff *skb, struct net_device *bond_dev)
|
|
|
{
|
|
|
- struct bonding *bond = bond_dev->priv;
|
|
|
+ struct bonding *bond = netdev_priv(bond_dev);
|
|
|
struct slave *slave, *start_at;
|
|
|
int i, slave_no, res = 1;
|
|
|
|
|
@@ -4331,7 +4331,7 @@ out:
|
|
|
*/
|
|
|
static int bond_xmit_activebackup(struct sk_buff *skb, struct net_device *bond_dev)
|
|
|
{
|
|
|
- struct bonding *bond = bond_dev->priv;
|
|
|
+ struct bonding *bond = netdev_priv(bond_dev);
|
|
|
int res = 1;
|
|
|
|
|
|
read_lock(&bond->lock);
|
|
@@ -4363,7 +4363,7 @@ out:
|
|
|
*/
|
|
|
static int bond_xmit_xor(struct sk_buff *skb, struct net_device *bond_dev)
|
|
|
{
|
|
|
- struct bonding *bond = bond_dev->priv;
|
|
|
+ struct bonding *bond = netdev_priv(bond_dev);
|
|
|
struct slave *slave, *start_at;
|
|
|
int slave_no;
|
|
|
int i;
|
|
@@ -4409,7 +4409,7 @@ out:
|
|
|
*/
|
|
|
static int bond_xmit_broadcast(struct sk_buff *skb, struct net_device *bond_dev)
|
|
|
{
|
|
|
- struct bonding *bond = bond_dev->priv;
|
|
|
+ struct bonding *bond = netdev_priv(bond_dev);
|
|
|
struct slave *slave, *start_at;
|
|
|
struct net_device *tx_dev = NULL;
|
|
|
int i;
|
|
@@ -4552,7 +4552,7 @@ static const struct ethtool_ops bond_ethtool_ops = {
|
|
|
*/
|
|
|
static int bond_init(struct net_device *bond_dev, struct bond_params *params)
|
|
|
{
|
|
|
- struct bonding *bond = bond_dev->priv;
|
|
|
+ struct bonding *bond = netdev_priv(bond_dev);
|
|
|
|
|
|
dprintk("Begin bond_init for %s\n", bond_dev->name);
|
|
|
|
|
@@ -4657,7 +4657,7 @@ static void bond_work_cancel_all(struct bonding *bond)
|
|
|
*/
|
|
|
static void bond_deinit(struct net_device *bond_dev)
|
|
|
{
|
|
|
- struct bonding *bond = bond_dev->priv;
|
|
|
+ struct bonding *bond = netdev_priv(bond_dev);
|
|
|
|
|
|
list_del(&bond->bond_list);
|
|
|
|
|
@@ -5149,7 +5149,7 @@ int bond_create(char *name, struct bond_params *params)
|
|
|
|
|
|
up_write(&bonding_rwsem);
|
|
|
rtnl_unlock(); /* allows sysfs registration of net device */
|
|
|
- res = bond_create_sysfs_entry(bond_dev->priv);
|
|
|
+ res = bond_create_sysfs_entry(netdev_priv(bond_dev));
|
|
|
if (res < 0) {
|
|
|
rtnl_lock();
|
|
|
down_write(&bonding_rwsem);
|