aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/iseries_veth.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/iseries_veth.c')
-rw-r--r--drivers/net/iseries_veth.c14
1 files changed, 6 insertions, 8 deletions
diff --git a/drivers/net/iseries_veth.c b/drivers/net/iseries_veth.c
index 9ece1fd9889d..53dd39e9130e 100644
--- a/drivers/net/iseries_veth.c
+++ b/drivers/net/iseries_veth.c
@@ -538,7 +538,7 @@ static void veth_handle_ack(struct veth_lpevent *event)
538 default: 538 default:
539 veth_error("Unknown ack type %d from LPAR %d.\n", 539 veth_error("Unknown ack type %d from LPAR %d.\n",
540 event->base_event.xSubtype, rlp); 540 event->base_event.xSubtype, rlp);
541 }; 541 }
542} 542}
543 543
544static void veth_handle_int(struct veth_lpevent *event) 544static void veth_handle_int(struct veth_lpevent *event)
@@ -584,7 +584,7 @@ static void veth_handle_int(struct veth_lpevent *event)
584 default: 584 default:
585 veth_error("Unknown interrupt type %d from LPAR %d.\n", 585 veth_error("Unknown interrupt type %d from LPAR %d.\n",
586 event->base_event.xSubtype, rlp); 586 event->base_event.xSubtype, rlp);
587 }; 587 }
588} 588}
589 589
590static void veth_handle_event(struct HvLpEvent *event) 590static void veth_handle_event(struct HvLpEvent *event)
@@ -964,11 +964,9 @@ static void veth_set_multicast_list(struct net_device *dev)
964 u8 *addr = ha->addr; 964 u8 *addr = ha->addr;
965 u64 xaddr = 0; 965 u64 xaddr = 0;
966 966
967 if (addr[0] & 0x01) {/* multicast address? */ 967 memcpy(&xaddr, addr, ETH_ALEN);
968 memcpy(&xaddr, addr, ETH_ALEN); 968 port->mcast_addr[port->num_mcast] = xaddr;
969 port->mcast_addr[port->num_mcast] = xaddr; 969 port->num_mcast++;
970 port->num_mcast++;
971 }
972 } 970 }
973 } 971 }
974 972
@@ -1184,7 +1182,7 @@ static int veth_start_xmit(struct sk_buff *skb, struct net_device *dev)
1184 struct veth_port *port = netdev_priv(dev); 1182 struct veth_port *port = netdev_priv(dev);
1185 HvLpIndexMap lpmask; 1183 HvLpIndexMap lpmask;
1186 1184
1187 if (! (frame[0] & 0x01)) { 1185 if (is_unicast_ether_addr(frame)) {
1188 /* unicast packet */ 1186 /* unicast packet */
1189 HvLpIndex rlp = frame[5]; 1187 HvLpIndex rlp = frame[5];
1190 1188