Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 45ed344c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

parents 99535ac2 bb7e8c5a

net/atm/lec.c

+1 −2
Original line number Diff line number Diff line
@@ -1811,8 +1811,7 @@ make_entry(struct lec_priv *priv, unsigned char *mac_addr) 
{

        struct lec_arp_table *to_return;



        to_return = (struct lec_arp_table *) kmalloc(sizeof(struct lec_arp_table),

						     GFP_ATOMIC);

        to_return = kmalloc(sizeof(struct lec_arp_table), GFP_ATOMIC);

        if (!to_return) {

                printk("LEC: Arp entry kmalloc failed\n");

                return NULL;

net/bridge/netfilter/ebt_stp.c

+1 −0
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ 


#include <linux/netfilter_bridge/ebtables.h>

#include <linux/netfilter_bridge/ebt_stp.h>

#include <linux/etherdevice.h>

#include <linux/module.h>



#define BPDU_TYPE_CONFIG 0

net/bridge/netfilter/ebtables.c

+2 −2
Original line number Diff line number Diff line
@@ -944,7 +944,7 @@ static int do_replace(void __user *user, unsigned int len) 
	if (countersize)

		memset(newinfo->counters, 0, countersize);



	newinfo->entries = (char *)vmalloc(tmp.entries_size);

	newinfo->entries = vmalloc(tmp.entries_size);

	if (!newinfo->entries) {

		ret = -ENOMEM;

		goto free_newinfo;
@@ -1146,7 +1146,7 @@ int ebt_register_table(struct ebt_table *table) 
	if (!newinfo)

		return -ENOMEM;



	newinfo->entries = (char *)vmalloc(table->table->entries_size);

	newinfo->entries = vmalloc(table->table->entries_size);

	if (!(newinfo->entries))

		goto free_newinfo;

net/core/dev_mcast.c

+1 −1
Original line number Diff line number Diff line
@@ -158,7 +158,7 @@ int dev_mc_add(struct net_device *dev, void *addr, int alen, int glbl) 
	int err = 0;

	struct dev_mc_list *dmi, *dmi1;



	dmi1 = (struct dev_mc_list *)kmalloc(sizeof(*dmi), GFP_ATOMIC);

	dmi1 = kmalloc(sizeof(*dmi), GFP_ATOMIC);



	spin_lock_bh(&dev->xmit_lock);

	for (dmi = dev->mc_list; dmi != NULL; dmi = dmi->next) {

net/core/dv.c

+1 −1
Original line number Diff line number Diff line
@@ -457,7 +457,7 @@ void divert_frame(struct sk_buff *skb) 
	unsigned char			*skb_data_end = skb->data + skb->len;



	/* Packet is already aimed at us, return */

	if (!compare_ether_addr(eth, skb->dev->dev_addr))

	if (!compare_ether_addr(eth->h_dest, skb->dev->dev_addr))

		return;

	

	/* proto is not IP, do nothing */