diff options
| author | David S. Miller <davem@davemloft.net> | 2009-04-21 04:32:26 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-04-21 04:32:26 -0400 |
| commit | e5e9743bb7429f53c83ad69b432f7b661e74c3f0 (patch) | |
| tree | db3691aef0d46c4aed4a2be6dc8ab7c44c3488cb /net/8021q | |
| parent | a0f82f64e26929776c58a5c93c2ecb38e3d82815 (diff) | |
| parent | 775d8d931581764a1ec982ebe5a927b12762fb6d (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
net/core/dev.c
Diffstat (limited to 'net/8021q')
| -rw-r--r-- | net/8021q/vlan_dev.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/8021q/vlan_dev.c b/net/8021q/vlan_dev.c index 1b34135cf990..6b0921364014 100644 --- a/net/8021q/vlan_dev.c +++ b/net/8021q/vlan_dev.c | |||
| @@ -668,7 +668,8 @@ static int vlan_ethtool_get_settings(struct net_device *dev, | |||
| 668 | const struct vlan_dev_info *vlan = vlan_dev_info(dev); | 668 | const struct vlan_dev_info *vlan = vlan_dev_info(dev); |
| 669 | struct net_device *real_dev = vlan->real_dev; | 669 | struct net_device *real_dev = vlan->real_dev; |
| 670 | 670 | ||
| 671 | if (!real_dev->ethtool_ops->get_settings) | 671 | if (!real_dev->ethtool_ops || |
| 672 | !real_dev->ethtool_ops->get_settings) | ||
| 672 | return -EOPNOTSUPP; | 673 | return -EOPNOTSUPP; |
| 673 | 674 | ||
| 674 | return real_dev->ethtool_ops->get_settings(real_dev, cmd); | 675 | return real_dev->ethtool_ops->get_settings(real_dev, cmd); |