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

Commit 3a5c3743 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
  pppoe: Must flush connections when MAC address changes too.
  include/linux/sdla.h: remove the prototype of sdla()
  tulip: dmfe: Remove old log spamming pr_debugs
parents dc6b8450 680ba7ca

drivers/net/pppoe.c

+2 −1
Original line number Diff line number Diff line
@@ -348,8 +348,9 @@ static int pppoe_device_event(struct notifier_block *this, 


	/* Only look at sockets that are using this specific device. */

	switch (event) {

	case NETDEV_CHANGEADDR:

	case NETDEV_CHANGEMTU:

		/* A change in mtu is a bad thing, requiring

		/* A change in mtu or address is a bad thing, requiring

		 * LCP re-negotiation.

		 */

drivers/net/tulip/dmfe.c

+0 −4
Original line number Diff line number Diff line
@@ -879,7 +879,6 @@ static void dmfe_free_tx_pkt(struct DEVICE *dev, struct dmfe_board_info * db) 
	txptr = db->tx_remove_ptr;

	while(db->tx_packet_cnt) {

		tdes0 = le32_to_cpu(txptr->tdes0);

		pr_debug("tdes0=%x\n", tdes0);

		if (tdes0 & 0x80000000)

			break;
@@ -889,7 +888,6 @@ static void dmfe_free_tx_pkt(struct DEVICE *dev, struct dmfe_board_info * db) 


		/* Transmit statistic counter */

		if ( tdes0 != 0x7fffffff ) {

			pr_debug("tdes0=%x\n", tdes0);

			dev->stats.collisions += (tdes0 >> 3) & 0xf;

			dev->stats.tx_bytes += le32_to_cpu(txptr->tdes1) & 0x7ff;

			if (tdes0 & TDES0_ERR_MASK) {
@@ -986,7 +984,6 @@ static void dmfe_rx_packet(struct DEVICE *dev, struct dmfe_board_info * db) 
			/* error summary bit check */

			if (rdes0 & 0x8000) {

				/* This is a error packet */

				pr_debug("rdes0: %x\n", rdes0);

				dev->stats.rx_errors++;

				if (rdes0 & 1)

					dev->stats.rx_fifo_errors++;
@@ -1638,7 +1635,6 @@ static u8 dmfe_sense_speed(struct dmfe_board_info * db) 
		else 				/* DM9102/DM9102A */

			phy_mode = phy_read(db->ioaddr,

				    db->phy_addr, 17, db->chip_id) & 0xf000;

		pr_debug("Phy_mode %x\n", phy_mode);

		switch (phy_mode) {

		case 0x1000: db->op_mode = DMFE_10MHF; break;

		case 0x2000: db->op_mode = DMFE_10MFD; break;

include/linux/sdla.h

+1 −5
Original line number Diff line number Diff line
@@ -112,11 +112,7 @@ struct sdla_dlci_conf { 
   short Tb_max;

};



#ifndef __KERNEL__



void sdla(void *cfg_info, char *dev, struct frad_conf *conf, int quiet);



#else

#ifdef __KERNEL__



/* important Z80 window addresses */

#define SDLA_CONTROL_WND		0xE000