diff options
Diffstat (limited to 'drivers/net/iseries_veth.c')
-rw-r--r-- | drivers/net/iseries_veth.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/net/iseries_veth.c b/drivers/net/iseries_veth.c index c46864d626b2..c7457f97259d 100644 --- a/drivers/net/iseries_veth.c +++ b/drivers/net/iseries_veth.c | |||
@@ -952,7 +952,7 @@ static int veth_change_mtu(struct net_device *dev, int new_mtu) | |||
952 | 952 | ||
953 | static void veth_set_multicast_list(struct net_device *dev) | 953 | static void veth_set_multicast_list(struct net_device *dev) |
954 | { | 954 | { |
955 | struct veth_port *port = (struct veth_port *) dev->priv; | 955 | struct veth_port *port = netdev_priv(dev); |
956 | unsigned long flags; | 956 | unsigned long flags; |
957 | 957 | ||
958 | write_lock_irqsave(&port->mcast_gate, flags); | 958 | write_lock_irqsave(&port->mcast_gate, flags); |
@@ -1044,7 +1044,7 @@ static struct net_device *veth_probe_one(int vlan, | |||
1044 | return NULL; | 1044 | return NULL; |
1045 | } | 1045 | } |
1046 | 1046 | ||
1047 | port = (struct veth_port *) dev->priv; | 1047 | port = netdev_priv(dev); |
1048 | 1048 | ||
1049 | spin_lock_init(&port->queue_lock); | 1049 | spin_lock_init(&port->queue_lock); |
1050 | rwlock_init(&port->mcast_gate); | 1050 | rwlock_init(&port->mcast_gate); |
@@ -1102,7 +1102,7 @@ static int veth_transmit_to_one(struct sk_buff *skb, HvLpIndex rlp, | |||
1102 | struct net_device *dev) | 1102 | struct net_device *dev) |
1103 | { | 1103 | { |
1104 | struct veth_lpar_connection *cnx = veth_cnx[rlp]; | 1104 | struct veth_lpar_connection *cnx = veth_cnx[rlp]; |
1105 | struct veth_port *port = (struct veth_port *) dev->priv; | 1105 | struct veth_port *port = netdev_priv(dev); |
1106 | HvLpEvent_Rc rc; | 1106 | HvLpEvent_Rc rc; |
1107 | struct veth_msg *msg = NULL; | 1107 | struct veth_msg *msg = NULL; |
1108 | unsigned long flags; | 1108 | unsigned long flags; |
@@ -1191,7 +1191,7 @@ static void veth_transmit_to_many(struct sk_buff *skb, | |||
1191 | static int veth_start_xmit(struct sk_buff *skb, struct net_device *dev) | 1191 | static int veth_start_xmit(struct sk_buff *skb, struct net_device *dev) |
1192 | { | 1192 | { |
1193 | unsigned char *frame = skb->data; | 1193 | unsigned char *frame = skb->data; |
1194 | struct veth_port *port = (struct veth_port *) dev->priv; | 1194 | struct veth_port *port = netdev_priv(dev); |
1195 | HvLpIndexMap lpmask; | 1195 | HvLpIndexMap lpmask; |
1196 | 1196 | ||
1197 | if (! (frame[0] & 0x01)) { | 1197 | if (! (frame[0] & 0x01)) { |
@@ -1255,7 +1255,7 @@ static void veth_wake_queues(struct veth_lpar_connection *cnx) | |||
1255 | if (! dev) | 1255 | if (! dev) |
1256 | continue; | 1256 | continue; |
1257 | 1257 | ||
1258 | port = (struct veth_port *)dev->priv; | 1258 | port = netdev_priv(dev); |
1259 | 1259 | ||
1260 | if (! (port->lpar_map & (1<<cnx->remote_lp))) | 1260 | if (! (port->lpar_map & (1<<cnx->remote_lp))) |
1261 | continue; | 1261 | continue; |
@@ -1284,7 +1284,7 @@ static void veth_stop_queues(struct veth_lpar_connection *cnx) | |||
1284 | if (! dev) | 1284 | if (! dev) |
1285 | continue; | 1285 | continue; |
1286 | 1286 | ||
1287 | port = (struct veth_port *)dev->priv; | 1287 | port = netdev_priv(dev); |
1288 | 1288 | ||
1289 | /* If this cnx is not on the vlan for this port, continue */ | 1289 | /* If this cnx is not on the vlan for this port, continue */ |
1290 | if (! (port->lpar_map & (1 << cnx->remote_lp))) | 1290 | if (! (port->lpar_map & (1 << cnx->remote_lp))) |
@@ -1506,7 +1506,7 @@ static void veth_receive(struct veth_lpar_connection *cnx, | |||
1506 | continue; | 1506 | continue; |
1507 | } | 1507 | } |
1508 | 1508 | ||
1509 | port = (struct veth_port *)dev->priv; | 1509 | port = netdev_priv(dev); |
1510 | dest = *((u64 *) skb->data) & 0xFFFFFFFFFFFF0000; | 1510 | dest = *((u64 *) skb->data) & 0xFFFFFFFFFFFF0000; |
1511 | 1511 | ||
1512 | if ((vlan > HVMAXARCHITECTEDVIRTUALLANS) || !port) { | 1512 | if ((vlan > HVMAXARCHITECTEDVIRTUALLANS) || !port) { |