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

Commit 28d9aa61 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
  [NET]: Mark Paul Moore as maintainer of labelled networking.
  [VLAN/BRIDGE]: Fix "skb_pull_rcsum - Fatal exception in interrupt"
  [ISDN]: Get rid of some pointless allocation casts in common and bsd comp.
  [NET]: Avoid pointless allocation casts in BSD compression module
  [IRDA]: Do not do pointless kmalloc return value cast in KingSun driver
  [NET]: Fix crash in dev_mc_sync()/dev_mc_unsync()
  [PPPOL2TP]: Fix endianness annotations.
  [IOAT]: ioatdma needs to to play nice in a multi-dma-client world
  [SLIP]: trivial sparse warning fix
  [EQL]: sparse warning fix
  [NET]: is_power_of_2 in net/core/neighbour.c
  [TCP]: Describe tcp_init_cwnd() thoroughly in a comment.
  [NET]: Fix IP_ADD/DROP_MEMBERSHIP to handle only connectionless
  [KBUILD]: Sanitize tc_ematch headers.
  [IPSEC] AH4: Update IPv4 options handling to conform to RFC 4302.
parents d243769d 10e2ff1c

MAINTAINERS

+6 −0
Original line number Original line Diff line number Diff line
@@ -2661,6 +2661,12 @@ L: netdev@vger.kernel.org 
T:	git kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6.git

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

S:	Maintained

S:	Maintained





NETWORKING [LABELED] (NetLabel, CIPSO, Labeled IPsec, SECMARK)

P:	Paul Moore

M:	paul.moore@hp.com

L:	netdev@vger.kernel.org

S:	Maintained



NETWORKING [WIRELESS]

NETWORKING [WIRELESS]

P:	John W. Linville

P:	John W. Linville

M:	linville@tuxdriver.com

M:	linville@tuxdriver.com

drivers/dma/ioatdma.c

+4 −14
Original line number Original line Diff line number Diff line
@@ -191,17 +191,12 @@ static int ioat_dma_alloc_chan_resources(struct dma_chan *chan) 
	int i;

	int i;

	LIST_HEAD(tmp_list);

	LIST_HEAD(tmp_list);





	/*

	/* have we already been set up? */

	 * In-use bit automatically set by reading chanctrl

	if (!list_empty(&ioat_chan->free_desc))

	 * If 0, we got it, if 1, someone else did

		return INITIAL_IOAT_DESC_COUNT;

	 */

	chanctrl = readw(ioat_chan->reg_base + IOAT_CHANCTRL_OFFSET);

	if (chanctrl & IOAT_CHANCTRL_CHANNEL_IN_USE)

		return -EBUSY;





        /* Setup register to interrupt and write completion status on error */

        /* Setup register to interrupt and write completion status on error */

	chanctrl = IOAT_CHANCTRL_CHANNEL_IN_USE |

	chanctrl = IOAT_CHANCTRL_ERR_INT_EN |

		IOAT_CHANCTRL_ERR_INT_EN |

		IOAT_CHANCTRL_ANY_ERR_ABORT_EN |

		IOAT_CHANCTRL_ANY_ERR_ABORT_EN |

		IOAT_CHANCTRL_ERR_COMPLETION_EN;

		IOAT_CHANCTRL_ERR_COMPLETION_EN;

        writew(chanctrl, ioat_chan->reg_base + IOAT_CHANCTRL_OFFSET);

        writew(chanctrl, ioat_chan->reg_base + IOAT_CHANCTRL_OFFSET);
@@ -282,11 +277,6 @@ static void ioat_dma_free_chan_resources(struct dma_chan *chan) 
			in_use_descs - 1);

			in_use_descs - 1);





	ioat_chan->last_completion = ioat_chan->completion_addr = 0;

	ioat_chan->last_completion = ioat_chan->completion_addr = 0;



	/* Tell hw the chan is free */

	chanctrl = readw(ioat_chan->reg_base + IOAT_CHANCTRL_OFFSET);

	chanctrl &= ~IOAT_CHANCTRL_CHANNEL_IN_USE;

	writew(chanctrl, ioat_chan->reg_base + IOAT_CHANCTRL_OFFSET);

}

}





static struct dma_async_tx_descriptor *

static struct dma_async_tx_descriptor *

drivers/isdn/i4l/isdn_bsdcomp.c

+2 −3
Original line number Original line Diff line number Diff line
@@ -341,7 +341,7 @@ static void *bsd_alloc (struct isdn_ppp_comp_data *data) 
	 * Allocate space for the dictionary. This may be more than one page in

	 * Allocate space for the dictionary. This may be more than one page in

	 * length.

	 * length.

	 */

	 */

	db->dict = (struct bsd_dict *) vmalloc (hsize * sizeof (struct bsd_dict));

	db->dict = vmalloc(hsize * sizeof(struct bsd_dict));

	if (!db->dict) {

	if (!db->dict) {

		bsd_free (db);

		bsd_free (db);

		return NULL;

		return NULL;
@@ -354,8 +354,7 @@ static void *bsd_alloc (struct isdn_ppp_comp_data *data) 
	if (!decomp)

	if (!decomp)

		db->lens = NULL;

		db->lens = NULL;

	else {

	else {

		db->lens = (unsigned short *) vmalloc ((maxmaxcode + 1) *

		db->lens = vmalloc((maxmaxcode + 1) * sizeof(db->lens[0]));

			sizeof (db->lens[0]));

		if (!db->lens) {

		if (!db->lens) {

			bsd_free (db);

			bsd_free (db);

			return (NULL);

			return (NULL);

drivers/isdn/i4l/isdn_common.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -2291,7 +2291,7 @@ static int __init isdn_init(void) 
	int i;

	int i;

	char tmprev[50];

	char tmprev[50];





	if (!(dev = (isdn_dev *) vmalloc(sizeof(isdn_dev)))) {

	if (!(dev = vmalloc(sizeof(isdn_dev)))) {

		printk(KERN_WARNING "isdn: Could not allocate device-struct.\n");

		printk(KERN_WARNING "isdn: Could not allocate device-struct.\n");

		return -EIO;

		return -EIO;

	}

	}

drivers/net/bsd_comp.c

+2 −4
Original line number Original line Diff line number Diff line
@@ -406,8 +406,7 @@ static void *bsd_alloc (unsigned char *options, int opt_len, int decomp) 
 * Allocate space for the dictionary. This may be more than one page in

 * Allocate space for the dictionary. This may be more than one page in

 * length.

 * length.

 */

 */

    db->dict = (struct bsd_dict *) vmalloc (hsize *

    db->dict = vmalloc(hsize * sizeof(struct bsd_dict));

					    sizeof (struct bsd_dict));

    if (!db->dict)

    if (!db->dict)

      {

      {

	bsd_free (db);

	bsd_free (db);
@@ -426,8 +425,7 @@ static void *bsd_alloc (unsigned char *options, int opt_len, int decomp) 
 */

 */

    else

    else

      {

      {

        db->lens = (unsigned short *) vmalloc ((maxmaxcode + 1) *

        db->lens = vmalloc((maxmaxcode + 1) * sizeof(db->lens[0]));

					       sizeof (db->lens[0]));

	if (!db->lens)

	if (!db->lens)

	  {

	  {

	    bsd_free (db);

	    bsd_free (db);