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

Commit 12157a8d 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: (21 commits)
  [TIPC]: Removing useless casts
  [IPV4]: Fix nexthop realm dumping for multipath routes
  [DUMMY]: Avoid an oops when dummy_init_one() failed
  [IFB] After ifb_init_one() failed, i is increased. Decrease
  [NET]: Fix reversed error test in netif_tx_trylock
  [MAINTAINERS]: Mark LAPB as Oprhan.
  [NET]: Conversions from kmalloc+memset to k(z|c)alloc.
  [NET]: sun happymeal, little pci cleanup
  [IrDA]: Use alloc_skb() in IrDA TX path
  [I/OAT]: Remove pci_module_init() from Intel I/OAT DMA engine
  [I/OAT]: net/core/user_dma.c should #include <net/netdma.h>
  [SCTP]: ADDIP: Don't use an address as source until it is ASCONF-ACKed
  [SCTP]: Set chunk->data_accepted only if we are going to accept it.
  [SCTP]: Verify all the paths to a peer via heartbeat before using them.
  [SCTP]: Unhash the endpoint in sctp_endpoint_free().
  [SCTP]: Check for NULL arg to sctp_bucket_destroy().
  [PKT_SCHED] netem: Fix slab corruption with netem (2nd try)
  [WAN]: Converted synclink drivers to use netif_carrier_*()
  [WAN]: Cosmetic changes to N2 and C101 drivers
  [WAN]: Added missing netif_dormant_off() to generic HDLC
  ...
parents efab4cbe 9df3f3d2

MAINTAINERS

+1 −3
Original line number Diff line number Diff line
@@ -1676,10 +1676,8 @@ L: linux-kernel@vger.kernel.org 
S:	Maintained



LAPB module

P:	Henner Eisen

M:	eis@baty.hanse.de

L:	linux-x25@vger.kernel.org

S:	Maintained

S:	Orphan



LASI 53c700 driver for PARISC

P:	James E.J. Bottomley

drivers/char/pcmcia/synclink_cs.c

+10 −4
Original line number Diff line number Diff line
@@ -1174,8 +1174,12 @@ static void dcd_change(MGSLPC_INFO *info) 
	else

		info->input_signal_events.dcd_down++;

#ifdef CONFIG_HDLC

	if (info->netcount)

		hdlc_set_carrier(info->serial_signals & SerialSignal_DCD, info->netdev);

	if (info->netcount) {

		if (info->serial_signals & SerialSignal_DCD)

			netif_carrier_on(info->netdev);

		else

			netif_carrier_off(info->netdev);

	}

#endif

	wake_up_interruptible(&info->status_event_wait_q);

	wake_up_interruptible(&info->event_wait_q);
@@ -4251,8 +4255,10 @@ static int hdlcdev_open(struct net_device *dev) 
	spin_lock_irqsave(&info->lock, flags);

	get_signals(info);

	spin_unlock_irqrestore(&info->lock, flags);

	hdlc_set_carrier(info->serial_signals & SerialSignal_DCD, dev);



	if (info->serial_signals & SerialSignal_DCD)

		netif_carrier_on(dev);

	else

		netif_carrier_off(dev);

	return 0;

}

drivers/char/synclink.c

+10 −4
Original line number Diff line number Diff line
@@ -1344,8 +1344,12 @@ static void mgsl_isr_io_pin( struct mgsl_struct *info ) 
			} else

				info->input_signal_events.dcd_down++;

#ifdef CONFIG_HDLC

			if (info->netcount)

				hdlc_set_carrier(status & MISCSTATUS_DCD, info->netdev);

			if (info->netcount) {

				if (status & MISCSTATUS_DCD)

					netif_carrier_on(info->netdev);

				else

					netif_carrier_off(info->netdev);

			}

#endif

		}

		if (status & MISCSTATUS_CTS_LATCHED)
@@ -7844,8 +7848,10 @@ static int hdlcdev_open(struct net_device *dev) 
	spin_lock_irqsave(&info->irq_spinlock, flags);

	usc_get_serial_signals(info);

	spin_unlock_irqrestore(&info->irq_spinlock, flags);

	hdlc_set_carrier(info->serial_signals & SerialSignal_DCD, dev);



	if (info->serial_signals & SerialSignal_DCD)

		netif_carrier_on(dev);

	else

		netif_carrier_off(dev);

	return 0;

}

drivers/char/synclink_gt.c

+10 −4
Original line number Diff line number Diff line
@@ -1497,8 +1497,10 @@ static int hdlcdev_open(struct net_device *dev) 
	spin_lock_irqsave(&info->lock, flags);

	get_signals(info);

	spin_unlock_irqrestore(&info->lock, flags);

	hdlc_set_carrier(info->signals & SerialSignal_DCD, dev);



	if (info->signals & SerialSignal_DCD)

		netif_carrier_on(dev);

	else

		netif_carrier_off(dev);

	return 0;

}
@@ -1997,8 +1999,12 @@ static void dcd_change(struct slgt_info *info) 
		info->input_signal_events.dcd_down++;

	}

#ifdef CONFIG_HDLC

	if (info->netcount)

		hdlc_set_carrier(info->signals & SerialSignal_DCD, info->netdev);

	if (info->netcount) {

		if (info->signals & SerialSignal_DCD)

			netif_carrier_on(info->netdev);

		else

			netif_carrier_off(info->netdev);

	}

#endif

	wake_up_interruptible(&info->status_event_wait_q);

	wake_up_interruptible(&info->event_wait_q);

drivers/char/synclinkmp.c

+10 −4
Original line number Diff line number Diff line
@@ -1752,8 +1752,10 @@ static int hdlcdev_open(struct net_device *dev) 
	spin_lock_irqsave(&info->lock, flags);

	get_signals(info);

	spin_unlock_irqrestore(&info->lock, flags);

	hdlc_set_carrier(info->serial_signals & SerialSignal_DCD, dev);



	if (info->serial_signals & SerialSignal_DCD)

		netif_carrier_on(dev);

	else

		netif_carrier_off(dev);

	return 0;

}
@@ -2522,8 +2524,12 @@ void isr_io_pin( SLMP_INFO *info, u16 status ) 
			} else

				info->input_signal_events.dcd_down++;

#ifdef CONFIG_HDLC

			if (info->netcount)

				hdlc_set_carrier(status & SerialSignal_DCD, info->netdev);

			if (info->netcount) {

				if (status & SerialSignal_DCD)

					netif_carrier_on(info->netdev);

				else

					netif_carrier_off(info->netdev);

			}

#endif

		}

		if (status & MISCSTATUS_CTS_LATCHED)