Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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
+3
-10
+2
-1
drivers/net/pppoe.c
+2
-1
drivers/net/pppoe.c
···
348
348
349
349
/* Only look at sockets that are using this specific device. */
350
350
switch (event) {
351
+
case NETDEV_CHANGEADDR:
351
352
case NETDEV_CHANGEMTU:
352
-
/* A change in mtu is a bad thing, requiring
353
+
/* A change in mtu or address is a bad thing, requiring
353
354
* LCP re-negotiation.
354
355
*/
355
356
-4
drivers/net/tulip/dmfe.c
-4
drivers/net/tulip/dmfe.c
···
879
879
txptr = db->tx_remove_ptr;
880
880
while(db->tx_packet_cnt) {
881
881
tdes0 = le32_to_cpu(txptr->tdes0);
882
-
pr_debug("tdes0=%x\n", tdes0);
883
882
if (tdes0 & 0x80000000)
884
883
break;
885
884
···
888
889
889
890
/* Transmit statistic counter */
890
891
if ( tdes0 != 0x7fffffff ) {
891
-
pr_debug("tdes0=%x\n", tdes0);
892
892
dev->stats.collisions += (tdes0 >> 3) & 0xf;
893
893
dev->stats.tx_bytes += le32_to_cpu(txptr->tdes1) & 0x7ff;
894
894
if (tdes0 & TDES0_ERR_MASK) {
···
984
986
/* error summary bit check */
985
987
if (rdes0 & 0x8000) {
986
988
/* This is a error packet */
987
-
pr_debug("rdes0: %x\n", rdes0);
988
989
dev->stats.rx_errors++;
989
990
if (rdes0 & 1)
990
991
dev->stats.rx_fifo_errors++;
···
1635
1638
else /* DM9102/DM9102A */
1636
1639
phy_mode = phy_read(db->ioaddr,
1637
1640
db->phy_addr, 17, db->chip_id) & 0xf000;
1638
-
pr_debug("Phy_mode %x\n", phy_mode);
1639
1641
switch (phy_mode) {
1640
1642
case 0x1000: db->op_mode = DMFE_10MHF; break;
1641
1643
case 0x2000: db->op_mode = DMFE_10MFD; break;
+1
-5
include/linux/sdla.h
+1
-5
include/linux/sdla.h