diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-03-20 19:21:47 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-03-20 19:21:47 -0400 |
| commit | cf2d9500a5a0df61713b56f2f40aa0b81a6f9f63 (patch) | |
| tree | 945afa7596fcdc4d960812dee1812c187d282bff /net/core/rtnetlink.c | |
| parent | 3f3b55bf7833d81d00c793d722e2af58d3b12963 (diff) | |
| parent | d714aaf649460cbfd5e82e75520baa856b4fa0a0 (diff) | |
Merge branch 'usb-linus' into usb-next
This is to pick up the fixes in that branch, and let Alan fix the merge
error in drivers/usb/host/ehci-timer.c better than I just did (as I know
I messed it up...)
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net/core/rtnetlink.c')
| -rw-r--r-- | net/core/rtnetlink.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c index b376410ff259..a585d45cc9d9 100644 --- a/net/core/rtnetlink.c +++ b/net/core/rtnetlink.c | |||
| @@ -979,6 +979,7 @@ static int rtnl_fill_ifinfo(struct sk_buff *skb, struct net_device *dev, | |||
| 979 | * report anything. | 979 | * report anything. |
| 980 | */ | 980 | */ |
| 981 | ivi.spoofchk = -1; | 981 | ivi.spoofchk = -1; |
| 982 | memset(ivi.mac, 0, sizeof(ivi.mac)); | ||
| 982 | if (dev->netdev_ops->ndo_get_vf_config(dev, i, &ivi)) | 983 | if (dev->netdev_ops->ndo_get_vf_config(dev, i, &ivi)) |
| 983 | break; | 984 | break; |
| 984 | vf_mac.vf = | 985 | vf_mac.vf = |