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

Commit 6762b47a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
  [ISDN]: Static overruns in drivers/isdn/i4l/isdn_ppp.c
  [WAN]: Remove broken and unmaintained Sangoma drivers.
  [BRIDGE] ebtables: fix allocation in net/bridge/netfilter/ebtables.c
  [DCCP]: Fix leak in net/dccp/ipv4.c
  [BRIDGE]: receive link-local on disabled ports.
  [IPv6] reassembly: Always compute hash under the fragment lock.
parents dcccdd93 052bb88e

MAINTAINERS

+0 −7
Original line number Diff line number Diff line
@@ -3058,13 +3058,6 @@ M: khali@linux-fr.org 
L:	lm-sensors@lm-sensors.org

S:	Odd Fixes



WAN ROUTER & SANGOMA WANPIPE DRIVERS & API (X.25, FRAME RELAY, PPP, CISCO HDLC)

P:	Nenad Corbic

M:	ncorbic@sangoma.com

M:	dm@sangoma.com

W:	http://www.sangoma.com

S:	Supported



WATCHDOG DEVICE DRIVERS

P:	Wim Van Sebroeck

M:	wim@iguana.be

drivers/isdn/i4l/isdn_ppp.c

+10 −10
Original line number Diff line number Diff line
@@ -109,7 +109,7 @@ isdn_ppp_free(isdn_net_local * lp) 
{

	struct ippp_struct *is;



	if (lp->ppp_slot < 0 || lp->ppp_slot > ISDN_MAX_CHANNELS) {

	if (lp->ppp_slot < 0 || lp->ppp_slot >= ISDN_MAX_CHANNELS) {

		printk(KERN_ERR "%s: ppp_slot(%d) out of range\n",

			__FUNCTION__, lp->ppp_slot);

		return 0;
@@ -126,7 +126,7 @@ isdn_ppp_free(isdn_net_local * lp) 
	lp->netdev->pb->ref_ct--;

	spin_unlock(&lp->netdev->pb->lock);

#endif /* CONFIG_ISDN_MPP */

	if (lp->ppp_slot < 0 || lp->ppp_slot > ISDN_MAX_CHANNELS) {

	if (lp->ppp_slot < 0 || lp->ppp_slot >= ISDN_MAX_CHANNELS) {

		printk(KERN_ERR "%s: ppp_slot(%d) now invalid\n",

			__FUNCTION__, lp->ppp_slot);

		return 0;
@@ -279,7 +279,7 @@ isdn_ppp_open(int min, struct file *file) 
	int slot;

	struct ippp_struct *is;



	if (min < 0 || min > ISDN_MAX_CHANNELS)

	if (min < 0 || min >= ISDN_MAX_CHANNELS)

		return -ENODEV;



	slot = isdn_ppp_get_slot();
@@ -1042,7 +1042,7 @@ isdn_ppp_push_higher(isdn_net_dev * net_dev, isdn_net_local * lp, struct sk_buff 
 	if (lp->master) { // FIXME?

		mlp = (isdn_net_local *) lp->master->priv;

 		slot = mlp->ppp_slot;

 		if (slot < 0 || slot > ISDN_MAX_CHANNELS) {

 		if (slot < 0 || slot >= ISDN_MAX_CHANNELS) {

 			printk(KERN_ERR "isdn_ppp_push_higher: master->ppp_slot(%d)\n",

 				lp->ppp_slot);

			goto drop_packet;
@@ -1264,7 +1264,7 @@ isdn_ppp_xmit(struct sk_buff *skb, struct net_device *netdev) 
	/* we have our lp locked from now on */



	slot = lp->ppp_slot;

	if (slot < 0 || slot > ISDN_MAX_CHANNELS) {

	if (slot < 0 || slot >= ISDN_MAX_CHANNELS) {

		printk(KERN_ERR "isdn_ppp_xmit: lp->ppp_slot(%d)\n",

			lp->ppp_slot);

		kfree_skb(skb);
@@ -1603,7 +1603,7 @@ static void isdn_ppp_mp_receive(isdn_net_dev * net_dev, isdn_net_local * lp, 
    	mp = net_dev->pb;

        stats = &mp->stats;

	slot = lp->ppp_slot;

	if (slot < 0 || slot > ISDN_MAX_CHANNELS) {

	if (slot < 0 || slot >= ISDN_MAX_CHANNELS) {

		printk(KERN_ERR "%s: lp->ppp_slot(%d)\n",

			__FUNCTION__, lp->ppp_slot);

		stats->frame_drops++;
@@ -1640,7 +1640,7 @@ static void isdn_ppp_mp_receive(isdn_net_dev * net_dev, isdn_net_local * lp, 
	is->last_link_seqno = minseq = newseq;

	for (lpq = net_dev->queue;;) {

		slot = lpq->ppp_slot;

		if (slot < 0 || slot > ISDN_MAX_CHANNELS) {

		if (slot < 0 || slot >= ISDN_MAX_CHANNELS) {

			printk(KERN_ERR "%s: lpq->ppp_slot(%d)\n",

				__FUNCTION__, lpq->ppp_slot);

		} else {
@@ -2648,7 +2648,7 @@ static void isdn_ppp_receive_ccp(isdn_net_dev *net_dev, isdn_net_local *lp, 


	printk(KERN_DEBUG "Received CCP frame from peer slot(%d)\n",

		lp->ppp_slot);

	if (lp->ppp_slot < 0 || lp->ppp_slot > ISDN_MAX_CHANNELS) {

	if (lp->ppp_slot < 0 || lp->ppp_slot >= ISDN_MAX_CHANNELS) {

		printk(KERN_ERR "%s: lp->ppp_slot(%d) out of range\n",

			__FUNCTION__, lp->ppp_slot);

		return;
@@ -2658,7 +2658,7 @@ static void isdn_ppp_receive_ccp(isdn_net_dev *net_dev, isdn_net_local *lp, 


	if(lp->master) {

		int slot = ((isdn_net_local *) (lp->master->priv))->ppp_slot;

		if (slot < 0 || slot > ISDN_MAX_CHANNELS) {

		if (slot < 0 || slot >= ISDN_MAX_CHANNELS) {

			printk(KERN_ERR "%s: slot(%d) out of range\n",

				__FUNCTION__, slot);

			return;
@@ -2845,7 +2845,7 @@ static void isdn_ppp_send_ccp(isdn_net_dev *net_dev, isdn_net_local *lp, struct 


	if (lp->master) {

		slot = ((isdn_net_local *) (lp->master->priv))->ppp_slot;

		if (slot < 0 || slot > ISDN_MAX_CHANNELS) {

		if (slot < 0 || slot >= ISDN_MAX_CHANNELS) {

			printk(KERN_ERR "%s: slot(%d) out of range\n",

				__FUNCTION__, slot);

			return;

drivers/net/wan/Kconfig

+0 −97
Original line number Diff line number Diff line
@@ -410,103 +410,6 @@ config WAN_ROUTER_DRIVERS 


	  If unsure, say N.



config VENDOR_SANGOMA

	tristate "Sangoma WANPIPE(tm) multiprotocol cards"

	depends on WAN_ROUTER_DRIVERS && WAN_ROUTER && (PCI || ISA) && BROKEN

	---help---

	  Driver for S514-PCI/ISA Synchronous Data Link Adapters (SDLA).



	  WANPIPE from Sangoma Technologies Inc. <http://www.sangoma.com/>

	  is a family of intelligent multiprotocol WAN adapters with data

	  transfer rates up to 4Mbps. Cards support:



	  - X.25, Frame Relay, PPP, Cisco HDLC protocols.



	  - API for protocols like HDLC (LAPB), HDLC Streaming, X.25,

	  Frame Relay and BiSync.



	  - Ethernet Bridging over Frame Relay protocol.



	  - MULTILINK PPP



	  - Async PPP (Modem Dialup)



	  The next questions will ask you about the protocols you want

	  the driver to support.



	  If you have one or more of these cards, say M to this option;

	  and read <file:Documentation/networking/wan-router.txt>.



	  To compile this driver as a module, choose M here: the

	  module will be called wanpipe.



config WANPIPE_CHDLC

	bool "WANPIPE Cisco HDLC support"

	depends on VENDOR_SANGOMA

	---help---

	  Connect a WANPIPE card to a leased line using the Cisco HDLC.



	  - Supports Dual Port Cisco HDLC on the S514-PCI/S508-ISA cards

	  which allows user to build applications using the HDLC streaming API.



	  - CHDLC Streaming MULTILINK PPP that can bind multiple WANPIPE T1

	  cards into a single logical channel.



	  Say Y and the Cisco HDLC support, HDLC streaming API and

	  MULTILINK PPP will be included in the driver.



config WANPIPE_FR

	bool "WANPIPE Frame Relay support"

	depends on VENDOR_SANGOMA

	help

	  Connect a WANPIPE card to a Frame Relay network, or use Frame Relay

	  API to develop custom applications.



	  Contains the Ethernet Bridging over Frame Relay feature, where

	  a WANPIPE frame relay link can be directly connected to the Linux

	  kernel bridge. The Frame Relay option is supported on S514-PCI

	  and S508-ISA cards.



	  Say Y and the Frame Relay support will be included in the driver.



config WANPIPE_X25

	bool "WANPIPE X.25 support"

	depends on VENDOR_SANGOMA

	help

	  Connect a WANPIPE card to an X.25 network.



	  Includes the X.25 API support for custom applications over the

	  X.25 protocol. The X.25 option is supported on S514-PCI and

	  S508-ISA cards.



	  Say Y and the X.25 support will be included in the driver.



config WANPIPE_PPP

	bool "WANPIPE PPP support"

	depends on VENDOR_SANGOMA

	help

	  Connect a WANPIPE card to a leased line using Point-to-Point

	  Protocol (PPP).



	  The PPP option is supported on S514-PCI/S508-ISA cards.



	  Say Y and the PPP support will be included in the driver.



config WANPIPE_MULTPPP

	bool "WANPIPE Multi-Port PPP support"

	depends on VENDOR_SANGOMA

	help

	  Connect a WANPIPE card to a leased line using Point-to-Point

	  Protocol (PPP).



	  Uses in-kernel SyncPPP protocol over the Sangoma HDLC Streaming

	  adapter. In this case each Sangoma adapter port can support an

	  independent PPP connection. For example, a single Quad-Port PCI

	  adapter can support up to four independent PPP links. The PPP

	  option is supported on S514-PCI/S508-ISA cards.



	  Say Y and the Multi-Port PPP support will be included in the driver.



config CYCLADES_SYNC

	tristate "Cyclom 2X(tm) cards (EXPERIMENTAL)"

	depends on WAN_ROUTER_DRIVERS && (PCI || ISA)

drivers/net/wan/Makefile

+0 −13
Original line number Diff line number Diff line
@@ -5,14 +5,6 @@ 
# Rewritten to use lists instead of if-statements.

#



wanpipe-y			:= sdlamain.o sdla_ft1.o

wanpipe-$(CONFIG_WANPIPE_X25)	+= sdla_x25.o

wanpipe-$(CONFIG_WANPIPE_FR)	+= sdla_fr.o

wanpipe-$(CONFIG_WANPIPE_CHDLC)	+= sdla_chdlc.o

wanpipe-$(CONFIG_WANPIPE_PPP)	+= sdla_ppp.o

wanpipe-$(CONFIG_WANPIPE_MULTPPP) += wanpipe_multppp.o

wanpipe-objs			:= $(wanpipe-y)



cyclomx-y                       := cycx_main.o

cyclomx-$(CONFIG_CYCLOMX_X25)	+= cycx_x25.o

cyclomx-objs			:= $(cyclomx-y)
@@ -43,11 +35,6 @@ obj-$(CONFIG_LANMEDIA) += lmc/ 


obj-$(CONFIG_DLCI)		+= dlci.o 

obj-$(CONFIG_SDLA)		+= sdla.o

ifeq ($(CONFIG_WANPIPE_MULTPPP),y)

  obj-$(CONFIG_VENDOR_SANGOMA) += sdladrv.o wanpipe.o syncppp.o	

else

  obj-$(CONFIG_VENDOR_SANGOMA) += sdladrv.o wanpipe.o

endif

obj-$(CONFIG_CYCLADES_SYNC)	+= cycx_drv.o cyclomx.o

obj-$(CONFIG_LAPBETHER)		+= lapbether.o

obj-$(CONFIG_SBNI)		+= sbni.o

drivers/net/wan/sdla_chdlc.c

deleted100644 → 0
+0 −4428

File deleted.

Preview size limit exceeded, changes collapsed.