Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6: (1699 commits) bnx2/bnx2x: Unsupported Ethtool operations should return -EINVAL. vlan: Calling vlan_hwaccel_do_receive() is always valid. tproxy: use the interface primary IP address as a default value for --on-ip tproxy: added IPv6 support to the socket match cxgb3: function namespace cleanup tproxy: added IPv6 support to the TPROXY target tproxy: added IPv6 socket lookup function to nf_tproxy_core be2net: Changes to use only priority codes allowed by f/w tproxy: allow non-local binds of IPv6 sockets if IP_TRANSPARENT is enabled tproxy: added tproxy sockopt interface in the IPV6 layer tproxy: added udp6_lib_lookup function tproxy: added const specifiers to udp lookup functions tproxy: split off ipv6 defragmentation to a separate module l2tp: small cleanup nf_nat: restrict ICMP translation for embedded header can: mcp251x: fix generation of error frames can: mcp251x: fix endless loop in interrupt handler if CANINTF_MERRF is set can-raw: add msg_flags to distinguish local traffic 9p: client code cleanup rds: make local functions/variables static ... Fix up conflicts in net/core/dev.c, drivers/net/pcmcia/smc91c92_cs.c and drivers/net/wireless/ath/ath9k/debug.c as per David
This commit is contained in:
@ -334,12 +334,12 @@ static ssize_t rt2x00debug_read_queue_stats(struct file *file,
|
||||
if (*offset)
|
||||
return 0;
|
||||
|
||||
data = kzalloc(lines * MAX_LINE_LENGTH, GFP_KERNEL);
|
||||
data = kcalloc(lines, MAX_LINE_LENGTH, GFP_KERNEL);
|
||||
if (!data)
|
||||
return -ENOMEM;
|
||||
|
||||
temp = data +
|
||||
sprintf(data, "qid\tcount\tlimit\tlength\tindex\tdone\tcrypto\n");
|
||||
sprintf(data, "qid\tcount\tlimit\tlength\tindex\tdma done\tdone\n");
|
||||
|
||||
queue_for_each(intf->rt2x00dev, queue) {
|
||||
spin_lock_irqsave(&queue->lock, irqflags);
|
||||
@ -347,8 +347,8 @@ static ssize_t rt2x00debug_read_queue_stats(struct file *file,
|
||||
temp += sprintf(temp, "%d\t%d\t%d\t%d\t%d\t%d\t%d\n", queue->qid,
|
||||
queue->count, queue->limit, queue->length,
|
||||
queue->index[Q_INDEX],
|
||||
queue->index[Q_INDEX_DONE],
|
||||
queue->index[Q_INDEX_CRYPTO]);
|
||||
queue->index[Q_INDEX_DMA_DONE],
|
||||
queue->index[Q_INDEX_DONE]);
|
||||
|
||||
spin_unlock_irqrestore(&queue->lock, irqflags);
|
||||
}
|
||||
@ -382,7 +382,7 @@ static ssize_t rt2x00debug_read_crypto_stats(struct file *file,
|
||||
loff_t *offset)
|
||||
{
|
||||
struct rt2x00debug_intf *intf = file->private_data;
|
||||
char *name[] = { "WEP64", "WEP128", "TKIP", "AES" };
|
||||
static const char * const name[] = { "WEP64", "WEP128", "TKIP", "AES" };
|
||||
char *data;
|
||||
char *temp;
|
||||
size_t size;
|
||||
@ -484,6 +484,9 @@ static ssize_t rt2x00debug_write_##__name(struct file *file, \
|
||||
if (index >= debug->__name.word_count) \
|
||||
return -EINVAL; \
|
||||
\
|
||||
if (length > sizeof(line)) \
|
||||
return -EINVAL; \
|
||||
\
|
||||
if (copy_from_user(line, buf, length)) \
|
||||
return -EFAULT; \
|
||||
\
|
||||
|
Reference in New Issue
Block a user