diff for duplicates of <200710242031.52610.mboton.lkml@gmail.com> diff --git a/a/1.txt b/N1/1.txt index 8a4b1f9..939ea13 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,13 +1,10 @@ -This is just http://lkml.org/lkml/2007/7/1/51 but adapted to b44 ssb dr= -iver. +This is just http://lkml.org/lkml/2007/7/1/51 but adapted to b44 ssb driver. I couldn't test it as I don't have a b44 ethernet device. -diff -ruN linux-2.6.23.orig/drivers/net/b44.c linux-2.6.23/drivers/net/= -b44.c ---- linux-2.6.23.orig/drivers/net/b44.c 2007-10-24 19:02:33.000000000 += -0200 +diff -ruN linux-2.6.23.orig/drivers/net/b44.c linux-2.6.23/drivers/net/b44.c +--- linux-2.6.23.orig/drivers/net/b44.c 2007-10-24 19:02:33.000000000 +0200 +++ linux-2.6.23/drivers/net/b44.c 2007-10-24 19:50:46.000000000 +0200 @@ -113,6 +113,8 @@ static void b44_init_rings(struct b44 *); #define B44_FULL_RESET 1 @@ -35,7 +32,7 @@ b44.c + * Don't enable PHY if we are doing a partial reset + * we are probably going to power down + */ -+ if (reset_kind =3D=3D B44_CHIP_RESET_PARTIAL) ++ if (reset_kind == B44_CHIP_RESET_PARTIAL) + return; + switch (sdev->bus->bustype) { @@ -57,60 +54,50 @@ b44.c } /* bp->lock is held. */ -@@ -1376,7 +1392,7 @@ static void b44_init_hw(struct b44 *bp, int reset= -_kind) +@@ -1376,7 +1392,7 @@ static void b44_init_hw(struct b44 *bp, int reset_kind) { u32 val; - b44_chip_reset(bp); + b44_chip_reset(bp, B44_CHIP_RESET_FULL); - if (reset_kind =3D=3D B44_FULL_RESET) { + if (reset_kind == B44_FULL_RESET) { b44_phy_reset(bp); b44_setup_phy(bp); @@ -1430,7 +1446,7 @@ static int b44_open(struct net_device *dev) - err =3D request_irq(dev->irq, b44_interrupt, IRQF_SHARED, dev->name, = -dev); + err = request_irq(dev->irq, b44_interrupt, IRQF_SHARED, dev->name, dev); if (unlikely(err < 0)) { - b44_chip_reset(bp); + b44_chip_reset(bp, B44_CHIP_RESET_PARTIAL); b44_free_rings(bp); b44_free_consistent(bp); goto out; -@@ -2250,7 +2266,7 @@ static int __devinit b44_init_one(struct pci_dev = -*pdev, +@@ -2250,7 +2266,7 @@ static int __devinit b44_init_one(struct pci_dev *pdev, /* Chip reset provides power to the b44 MAC & PCI cores, which * is necessary for MAC register access. */ - b44_chip_reset(bp); + b44_chip_reset(bp, B44_CHIP_RESET_FULL); - printk(KERN_INFO "%s: Broadcom 4400 10/100BaseT Ethernet ", dev->name= -); - for (i =3D 0; i < 6; i++) -@@ -2284,4 +2300,5 @@ static void __devexit b44_remove_one(struct ssb_d= -ev=20 + printk(KERN_INFO "%s: Broadcom 4400 10/100BaseT Ethernet ", dev->name); + for (i = 0; i < 6; i++) +@@ -2284,4 +2300,5 @@ static void __devexit b44_remove_one(struct ssb_dev *sdev) free_netdev(dev); + ssb_pci_set_power_state(sdev, PCI_D3hot); ssb_set_drvdata(sdev, NULL); } -@@ -2312,6 +2329,7 @@ static int b44_suspend(struct ssb_dev *sdev,=20 +@@ -2312,6 +2329,7 @@ static int b44_suspend(struct ssb_dev *sdev, pm_message_t state) b44_setup_wol(bp); } -=20 + + ssb_pci_set_power_state(sdev, PCI_D3hot); return 0; } ---=20 - Miguel Bot=F3n -- -To unsubscribe from this list: send the line "unsubscribe linux-wireles= -s" in -the body of a message to majordomo@vger.kernel.org -More majordomo info at http://vger.kernel.org/majordomo-info.html +-- + Miguel Botón diff --git a/a/content_digest b/N1/content_digest index 51fe006..fca0903 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -6,16 +6,13 @@ " linville@tuxdriver.com\0" "\00:1\0" "b\0" - "This is just http://lkml.org/lkml/2007/7/1/51 but adapted to b44 ssb dr=\n" - "iver.\n" + "This is just http://lkml.org/lkml/2007/7/1/51 but adapted to b44 ssb driver.\n" "\n" "I couldn't test it as I don't have a b44 ethernet device.\n" "\n" "\n" - "diff -ruN linux-2.6.23.orig/drivers/net/b44.c linux-2.6.23/drivers/net/=\n" - "b44.c\n" - "--- linux-2.6.23.orig/drivers/net/b44.c\t2007-10-24 19:02:33.000000000 +=\n" - "0200\n" + "diff -ruN linux-2.6.23.orig/drivers/net/b44.c linux-2.6.23/drivers/net/b44.c\n" + "--- linux-2.6.23.orig/drivers/net/b44.c\t2007-10-24 19:02:33.000000000 +0200\n" "+++ linux-2.6.23/drivers/net/b44.c\t2007-10-24 19:50:46.000000000 +0200\n" "@@ -113,6 +113,8 @@ static void b44_init_rings(struct b44 *);\n" " #define B44_FULL_RESET\t\t1\n" @@ -43,7 +40,7 @@ "+\t * Don't enable PHY if we are doing a partial reset\n" "+\t * we are probably going to power down\n" "+\t */\n" - "+\tif (reset_kind =3D=3D B44_CHIP_RESET_PARTIAL)\n" + "+\tif (reset_kind == B44_CHIP_RESET_PARTIAL)\n" "+\t\treturn;\n" "+\n" " \tswitch (sdev->bus->bustype) {\n" @@ -65,62 +62,52 @@ " }\n" "\n" " /* bp->lock is held. */\n" - "@@ -1376,7 +1392,7 @@ static void b44_init_hw(struct b44 *bp, int reset=\n" - "_kind)\n" + "@@ -1376,7 +1392,7 @@ static void b44_init_hw(struct b44 *bp, int reset_kind)\n" " {\n" " \tu32 val;\n" "\n" "-\tb44_chip_reset(bp);\n" "+\tb44_chip_reset(bp, B44_CHIP_RESET_FULL);\n" - " \tif (reset_kind =3D=3D B44_FULL_RESET) {\n" + " \tif (reset_kind == B44_FULL_RESET) {\n" " \t\tb44_phy_reset(bp);\n" " \t\tb44_setup_phy(bp);\n" "@@ -1430,7 +1446,7 @@ static int b44_open(struct net_device *dev)\n" "\n" - " \terr =3D request_irq(dev->irq, b44_interrupt, IRQF_SHARED, dev->name, =\n" - "dev);\n" + " \terr = request_irq(dev->irq, b44_interrupt, IRQF_SHARED, dev->name, dev);\n" " \tif (unlikely(err < 0)) {\n" "-\t\tb44_chip_reset(bp);\n" "+\t\tb44_chip_reset(bp, B44_CHIP_RESET_PARTIAL);\n" " \t\tb44_free_rings(bp);\n" " \t\tb44_free_consistent(bp);\n" " \t\tgoto out;\n" - "@@ -2250,7 +2266,7 @@ static int __devinit b44_init_one(struct pci_dev =\n" - "*pdev,\n" + "@@ -2250,7 +2266,7 @@ static int __devinit b44_init_one(struct pci_dev *pdev,\n" " \t/* Chip reset provides power to the b44 MAC & PCI cores, which\n" " \t * is necessary for MAC register access.\n" " \t */\n" "-\tb44_chip_reset(bp);\n" "+\tb44_chip_reset(bp, B44_CHIP_RESET_FULL);\n" "\n" - " \tprintk(KERN_INFO \"%s: Broadcom 4400 10/100BaseT Ethernet \", dev->name=\n" - ");\n" - " \tfor (i =3D 0; i < 6; i++)\n" - "@@ -2284,4 +2300,5 @@ static void __devexit b44_remove_one(struct ssb_d=\n" - "ev=20\n" + " \tprintk(KERN_INFO \"%s: Broadcom 4400 10/100BaseT Ethernet \", dev->name);\n" + " \tfor (i = 0; i < 6; i++)\n" + "@@ -2284,4 +2300,5 @@ static void __devexit b44_remove_one(struct ssb_dev \n" "*sdev)\n" " \tfree_netdev(dev);\n" "+\tssb_pci_set_power_state(sdev, PCI_D3hot);\n" " \tssb_set_drvdata(sdev, NULL);\n" " }\n" "\n" - "@@ -2312,6 +2329,7 @@ static int b44_suspend(struct ssb_dev *sdev,=20\n" + "@@ -2312,6 +2329,7 @@ static int b44_suspend(struct ssb_dev *sdev, \n" "pm_message_t state)\n" " \t\tb44_setup_wol(bp);\n" " \t}\n" - "=20\n" + " \n" "+\tssb_pci_set_power_state(sdev, PCI_D3hot);\n" " \treturn 0;\n" " }\n" "\n" "\n" "\n" - "--=20\n" - "\tMiguel Bot=F3n\n" - "-\n" - "To unsubscribe from this list: send the line \"unsubscribe linux-wireles=\n" - "s\" in\n" - "the body of a message to majordomo@vger.kernel.org\n" - More majordomo info at http://vger.kernel.org/majordomo-info.html + "-- \n" + "\tMiguel Bot\303\263n" -004e2c0a5603f09afb25cac6474e6c494e009e2a2e28e63ce02d0f5962f3e70a +8228b0c7a185f3ed53598de30e00fbbe9174da8c30414a861f68d54610bacdfe
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.