apfs/linux-apfs
0
0
Fork 0
mirror of https://github.com/linux-apfs/linux-apfs.git synced 2026-05-01 15:00:59 -07:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	drivers/net/can/Kconfig
This commit is contained in:
David S. Miller
2009-11-17 00:05:02 -08:00
parent 5c427ff9e4 82b3cc1a2f
commit a2bfbc072e
32 changed files with 363 additions and 465 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/net/can/dev.c
+6
View File
@@ -677,6 +677,11 @@ nla_put_failure:
return -EMSGSIZE;
}
static size_t can_get_xstats_size(const struct net_device *dev)
{
return sizeof(struct can_device_stats);
}
static int can_fill_xstats(struct sk_buff *skb, const struct net_device *dev)
{
struct can_priv *priv = netdev_priv(dev);
@@ -705,6 +710,7 @@ static struct rtnl_link_ops can_link_ops __read_mostly = {
.changelink = can_changelink,
.get_size = can_get_size,
.fill_info = can_fill_info,
.get_xstats_size = can_get_xstats_size,
.fill_xstats = can_fill_xstats,
};