diff options
| author | David S. Miller <davem@davemloft.net> | 2010-10-11 12:30:34 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-10-11 12:30:34 -0700 |
| commit | d122179a3c0fdc71b88cb9e3605f372b1651a9ff (patch) | |
| tree | 63a48b333e7565967b6d7c9e246557bfcb9f225f /net/core/ethtool.c | |
| parent | 419c20465d6319274e7286f0966e2390540e6e0a (diff) | |
| parent | b00916b189d13a615ff05c9242201135992fcda3 (diff) | |
| download | op-kernel-dev-d122179a3c0fdc71b88cb9e3605f372b1651a9ff.zip op-kernel-dev-d122179a3c0fdc71b88cb9e3605f372b1651a9ff.tar.gz | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
net/core/ethtool.c
Diffstat (limited to 'net/core/ethtool.c')
| -rw-r--r-- | net/core/ethtool.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/core/ethtool.c b/net/core/ethtool.c index 7d7e572..685c700 100644 --- a/net/core/ethtool.c +++ b/net/core/ethtool.c @@ -355,7 +355,7 @@ static noinline_for_stack int ethtool_get_rxnfc(struct net_device *dev, if (info.cmd == ETHTOOL_GRXCLSRLALL) { if (info.rule_cnt > 0) { if (info.rule_cnt <= KMALLOC_MAX_SIZE / sizeof(u32)) - rule_buf = kmalloc(info.rule_cnt * sizeof(u32), + rule_buf = kzalloc(info.rule_cnt * sizeof(u32), GFP_USER); if (!rule_buf) return -ENOMEM; @@ -404,7 +404,7 @@ static noinline_for_stack int ethtool_get_rxfh_indir(struct net_device *dev, (KMALLOC_MAX_SIZE - sizeof(*indir)) / sizeof(*indir->ring_index)) return -ENOMEM; full_size = sizeof(*indir) + sizeof(*indir->ring_index) * table_size; - indir = kmalloc(full_size, GFP_USER); + indir = kzalloc(full_size, GFP_USER); if (!indir) return -ENOMEM; @@ -579,7 +579,7 @@ static int ethtool_get_rx_ntuple(struct net_device *dev, void __user *useraddr) gstrings.len = ret; - data = kmalloc(gstrings.len * ETH_GSTRING_LEN, GFP_USER); + data = kzalloc(gstrings.len * ETH_GSTRING_LEN, GFP_USER); if (!data) return -ENOMEM; |
