lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

Browse Source 
Conflicts:
	net/core/dev.c
This commit is contained in:
David S. Miller
2009-04-21 01:32:26 -07:00
parent a0f82f64e2 775d8d9315
commit e5e9743bb7
55 changed files with 542 additions and 291 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
net/8021q/vlan_dev.c
View File

@@ -668,7 +668,8 @@ static int vlan_ethtool_get_settings(struct net_device *dev,
const struct vlan_dev_info *vlan = vlan_dev_info(dev);
struct net_device *real_dev = vlan->real_dev;
if (!real_dev->ethtool_ops->get_settings)
if (!real_dev->ethtool_ops ||
!real_dev->ethtool_ops->get_settings)
return -EOPNOTSUPP;
return real_dev->ethtool_ops->get_settings(real_dev, cmd);