Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 144593
b: refs/heads/master
c: 1824a98
h: refs/heads/master
i:
  144591: 59f8a8a
v: v3
  • Loading branch information
Alex Williamson authored and David S. Miller committed May 2, 2009
1 parent e7a449d commit 64e3427
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 23e258e1a871c0c0cd91c294f7e66ccac74ef243
refs/heads/master: 1824a9897473fda5e5e42f991ddc674c175e3a09
8 changes: 4 additions & 4 deletions trunk/drivers/net/virtio_net.c
Original file line number Diff line number Diff line change
Expand Up @@ -748,7 +748,7 @@ static void virtnet_set_rx_mode(struct net_device *dev)
kfree(buf);
}

static void virnet_vlan_rx_add_vid(struct net_device *dev, u16 vid)
static void virtnet_vlan_rx_add_vid(struct net_device *dev, u16 vid)
{
struct virtnet_info *vi = netdev_priv(dev);
struct scatterlist sg;
Expand All @@ -760,7 +760,7 @@ static void virnet_vlan_rx_add_vid(struct net_device *dev, u16 vid)
dev_warn(&dev->dev, "Failed to add VLAN ID %d.\n", vid);
}

static void virnet_vlan_rx_kill_vid(struct net_device *dev, u16 vid)
static void virtnet_vlan_rx_kill_vid(struct net_device *dev, u16 vid)
{
struct virtnet_info *vi = netdev_priv(dev);
struct scatterlist sg;
Expand Down Expand Up @@ -798,8 +798,8 @@ static const struct net_device_ops virtnet_netdev = {
.ndo_set_mac_address = virtnet_set_mac_address,
.ndo_set_rx_mode = virtnet_set_rx_mode,
.ndo_change_mtu = virtnet_change_mtu,
.ndo_vlan_rx_add_vid = virnet_vlan_rx_add_vid,
.ndo_vlan_rx_kill_vid = virnet_vlan_rx_kill_vid,
.ndo_vlan_rx_add_vid = virtnet_vlan_rx_add_vid,
.ndo_vlan_rx_kill_vid = virtnet_vlan_rx_kill_vid,
#ifdef CONFIG_NET_POLL_CONTROLLER
.ndo_poll_controller = virtnet_netpoll,
#endif
Expand Down

0 comments on commit 64e3427

Please sign in to comment.