openkylin
/
platform_kernel-5.15
mirror of https://gitee.com/openkylin/platform_kernel-5.15.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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
This commit is contained in:
Linus Torvalds 2011-07-18 13:29:26 -07:00
parent dc6b845044 680ba7ca63
commit 3a5c3743f1
3 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/net/pppoe.c
View File

@ -348,8 +348,9 @@ static int pppoe_device_event(struct notifier_block *this,
/* Only look at sockets that are using this specific device. */ /* Only look at sockets that are using this specific device. */
switch (event) { switch (event) {
case NETDEV_CHANGEADDR:
case NETDEV_CHANGEMTU: 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. * LCP re-negotiation.
*/ */

4
drivers/net/tulip/dmfe.c
View File

@ -879,7 +879,6 @@ static void dmfe_free_tx_pkt(struct DEVICE *dev, struct dmfe_board_info * db)
txptr = db->tx_remove_ptr; txptr = db->tx_remove_ptr;
while(db->tx_packet_cnt) { while(db->tx_packet_cnt) {
tdes0 = le32_to_cpu(txptr->tdes0); tdes0 = le32_to_cpu(txptr->tdes0);
pr_debug("tdes0=%x\n", tdes0);
if (tdes0 & 0x80000000) if (tdes0 & 0x80000000)
break; break;
@ -889,7 +888,6 @@ static void dmfe_free_tx_pkt(struct DEVICE *dev, struct dmfe_board_info * db)
/* Transmit statistic counter */ /* Transmit statistic counter */
if ( tdes0 != 0x7fffffff ) { if ( tdes0 != 0x7fffffff ) {
pr_debug("tdes0=%x\n", tdes0);
dev->stats.collisions += (tdes0 >> 3) & 0xf; dev->stats.collisions += (tdes0 >> 3) & 0xf;
dev->stats.tx_bytes += le32_to_cpu(txptr->tdes1) & 0x7ff; dev->stats.tx_bytes += le32_to_cpu(txptr->tdes1) & 0x7ff;
if (tdes0 & TDES0_ERR_MASK) { 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 */ /* error summary bit check */
if (rdes0 & 0x8000) { if (rdes0 & 0x8000) {
/* This is a error packet */ /* This is a error packet */
pr_debug("rdes0: %x\n", rdes0);
dev->stats.rx_errors++; dev->stats.rx_errors++;
if (rdes0 & 1) if (rdes0 & 1)
dev->stats.rx_fifo_errors++; dev->stats.rx_fifo_errors++;
@ -1638,7 +1635,6 @@ static u8 dmfe_sense_speed(struct dmfe_board_info * db)
else /* DM9102/DM9102A */ else /* DM9102/DM9102A */
phy_mode = phy_read(db->ioaddr, phy_mode = phy_read(db->ioaddr,
db->phy_addr, 17, db->chip_id) & 0xf000; db->phy_addr, 17, db->chip_id) & 0xf000;
pr_debug("Phy_mode %x\n", phy_mode);
switch (phy_mode) { switch (phy_mode) {
case 0x1000: db->op_mode = DMFE_10MHF; break; case 0x1000: db->op_mode = DMFE_10MHF; break;
case 0x2000: db->op_mode = DMFE_10MFD; break; case 0x2000: db->op_mode = DMFE_10MFD; break;

6
include/linux/sdla.h
View File

@ -112,11 +112,7 @@ struct sdla_dlci_conf {
short Tb_max; short Tb_max;
}; };
#ifndef __KERNEL__ #ifdef __KERNEL__
void sdla(void *cfg_info, char *dev, struct frad_conf *conf, int quiet);
#else
/* important Z80 window addresses */ /* important Z80 window addresses */
#define SDLA_CONTROL_WND 0xE000 #define SDLA_CONTROL_WND 0xE000