From 87cafc32a53fe2def92dbf999002796386562d75 Mon Sep 17 00:00:00 2001 From: Dmitry Kravkov Date: Wed, 27 Mar 2013 06:54:00 +0000 Subject: [PATCH] --- yaml --- r: 362020 b: refs/heads/master c: 24f11a5cf538a8fcc10d61f457e9a2094fb965b4 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/include/linux/netdevice.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index fda288bc118c..aea11cc36194 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 715230a44310a8cf66fbfb5a46f9a62a9b2de424 +refs/heads/master: 24f11a5cf538a8fcc10d61f457e9a2094fb965b4 diff --git a/trunk/include/linux/netdevice.h b/trunk/include/linux/netdevice.h index b3d00fa4b314..8bfa95600e48 100644 --- a/trunk/include/linux/netdevice.h +++ b/trunk/include/linux/netdevice.h @@ -895,7 +895,7 @@ struct netdev_fcoe_hbainfo { * * int (*ndo_bridge_setlink)(struct net_device *dev, struct nlmsghdr *nlh) * int (*ndo_bridge_getlink)(struct sk_buff *skb, u32 pid, u32 seq, - * struct net_device *dev) + * struct net_device *dev, u32 filter_mask) * * int (*ndo_change_carrier)(struct net_device *dev, bool new_carrier); * Called to change device carrier. Soft-devices (like dummy, team, etc)