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

Commit 8800cea6 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

parents 84e48b6d 14d50e78

drivers/net/ppp_deflate.c

+2 −4
Original line number Diff line number Diff line
@@ -87,7 +87,6 @@ static void z_comp_free(void *arg) 


	if (state) {

		zlib_deflateEnd(&state->strm);

		if (state->strm.workspace)

		vfree(state->strm.workspace);

		kfree(state);

	}
@@ -308,7 +307,6 @@ static void z_decomp_free(void *arg) 


	if (state) {

		zlib_inflateEnd(&state->strm);

		if (state->strm.workspace)

		kfree(state->strm.workspace);

		kfree(state);

	}

drivers/net/ppp_generic.c

+4 −8
Original line number Diff line number Diff line
@@ -2467,14 +2467,10 @@ static void ppp_destroy_interface(struct ppp *ppp) 
	skb_queue_purge(&ppp->mrq);

#endif /* CONFIG_PPP_MULTILINK */

#ifdef CONFIG_PPP_FILTER

	if (ppp->pass_filter) {

	kfree(ppp->pass_filter);

	ppp->pass_filter = NULL;

	}

	if (ppp->active_filter) {

	kfree(ppp->active_filter);

	ppp->active_filter = NULL;

	}

#endif /* CONFIG_PPP_FILTER */



	kfree(ppp);

drivers/net/wan/cycx_x25.c

+2 −6
Original line number Diff line number Diff line
@@ -436,9 +436,7 @@ static int cycx_wan_new_if(struct wan_device *wandev, struct net_device *dev, 
	}



	if (err) {

		if (chan->local_addr)

		kfree(chan->local_addr);



		kfree(chan);

		return err;

	}
@@ -458,9 +456,7 @@ static int cycx_wan_del_if(struct wan_device *wandev, struct net_device *dev) 
		struct cycx_x25_channel *chan = dev->priv;



		if (chan->svc) {

			if (chan->local_addr)

			kfree(chan->local_addr);



			if (chan->state == WAN_CONNECTED)

				del_timer(&chan->timer);

		}

drivers/net/wan/pc300_tty.c

+11 −16
Original line number Diff line number Diff line
@@ -400,10 +400,8 @@ static void cpc_tty_close(struct tty_struct *tty, struct file *flip) 
		cpc_tty->buf_rx.last = NULL;

	}

	

	if (cpc_tty->buf_tx) {

	kfree(cpc_tty->buf_tx);

	cpc_tty->buf_tx = NULL;

	}



	CPC_TTY_DBG("%s: TTY closed\n",cpc_tty->name);
@@ -691,7 +689,7 @@ static void cpc_tty_rx_work(void * data) 
					}

				}	

				cpc_tty->buf_rx.first = cpc_tty->buf_rx.first->next;

				kfree((unsigned char *)buf);

				kfree(buf);

				buf = cpc_tty->buf_rx.first;

				flg_rx = 1;

			}
@@ -771,10 +769,7 @@ void cpc_tty_receive(pc300dev_t *pc300dev) 
				cpc_writel(card->hw.scabase + DRX_REG(EDAL, ch), 

						RX_BD_ADDR(ch, pc300chan->rx_last_bd)); 

			}

			if (new) {

			kfree(new);

				new = NULL;

			}

			return; 

		}

drivers/net/wan/sdla_chdlc.c

+4 −9
Original line number Diff line number Diff line
@@ -3664,16 +3664,11 @@ static void wanpipe_tty_close(struct tty_struct *tty, struct file * filp) 
		chdlc_disable_comm_shutdown(card);

		unlock_adapter_irq(&card->wandev.lock,&smp_flags);



		if (card->tty_buf){

		kfree(card->tty_buf);

		card->tty_buf = NULL;			

		}



		if (card->tty_rx){

		kfree(card->tty_rx);

		card->tty_rx = NULL;

	}

	}

	return;

}

static int wanpipe_tty_open(struct tty_struct *tty, struct file * filp)