diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-06-02 14:18:06 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-06-02 14:18:06 +0200 |
| commit | c7a441bba9de3b4e166b6a4449208bc906d70558 (patch) | |
| tree | 346fdf11e464c8201a9aaa8abdd1c1b6dc4f86e0 /drivers/net/ksz884x.c | |
| parent | Merge branch 'fix/hda' into for-linus (diff) | |
| parent | Merge branch 'master' of git.alsa-project.org:alsa-kernel into fix/hda (diff) | |
| download | linux-c7a441bba9de3b4e166b6a4449208bc906d70558.tar.xz linux-c7a441bba9de3b4e166b6a4449208bc906d70558.zip | |
Merge branch 'fix/hda' into for-linus
Diffstat (limited to 'drivers/net/ksz884x.c')
| -rw-r--r-- | drivers/net/ksz884x.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/ksz884x.c b/drivers/net/ksz884x.c index c80ca64277b2..7805bbf1d53a 100644 --- a/drivers/net/ksz884x.c +++ b/drivers/net/ksz884x.c @@ -4854,7 +4854,7 @@ static inline void copy_old_skb(struct sk_buff *old, struct sk_buff *skb) * * Return 0 if successful; otherwise an error code indicating failure. */ -static int netdev_tx(struct sk_buff *skb, struct net_device *dev) +static netdev_tx_t netdev_tx(struct sk_buff *skb, struct net_device *dev) { struct dev_priv *priv = netdev_priv(dev); struct dev_info *hw_priv = priv->adapter; @@ -6863,6 +6863,7 @@ static const struct net_device_ops netdev_ops = { .ndo_tx_timeout = netdev_tx_timeout, .ndo_change_mtu = netdev_change_mtu, .ndo_set_mac_address = netdev_set_mac_address, + .ndo_validate_addr = eth_validate_addr, .ndo_do_ioctl = netdev_ioctl, .ndo_set_rx_mode = netdev_set_rx_mode, #ifdef CONFIG_NET_POLL_CONTROLLER |