diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2015-03-25 14:30:46 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2015-03-25 14:30:46 +0000 |
| commit | fafa3f57e3404c3e45c5a3c94fd50226896de470 (patch) | |
| tree | bee4d4e1110b175a5f4c8ad5959c0b00c196f049 /target/linux/generic/patches-3.18/077-01-bgmac-fix-descriptor-frame-start-end-definitions.patch | |
| parent | 68ca1f285ccda00ae3c5ee758919cc6f1a38e719 (diff) | |
| download | upstream-fafa3f57e3404c3e45c5a3c94fd50226896de470.tar.gz upstream-fafa3f57e3404c3e45c5a3c94fd50226896de470.tar.bz2 upstream-fafa3f57e3404c3e45c5a3c94fd50226896de470.zip | |
kernel: merge upstream bgmac driver improvements
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
SVN-Revision: 44978
Diffstat (limited to 'target/linux/generic/patches-3.18/077-01-bgmac-fix-descriptor-frame-start-end-definitions.patch')
| -rw-r--r-- | target/linux/generic/patches-3.18/077-01-bgmac-fix-descriptor-frame-start-end-definitions.patch | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/target/linux/generic/patches-3.18/077-01-bgmac-fix-descriptor-frame-start-end-definitions.patch b/target/linux/generic/patches-3.18/077-01-bgmac-fix-descriptor-frame-start-end-definitions.patch new file mode 100644 index 0000000000..fdfae3aeff --- /dev/null +++ b/target/linux/generic/patches-3.18/077-01-bgmac-fix-descriptor-frame-start-end-definitions.patch @@ -0,0 +1,24 @@ +From: Felix Fietkau <nbd@openwrt.org> +Date: Mon, 23 Mar 2015 02:40:06 +0100 +Subject: [PATCH] bgmac: fix descriptor frame start/end definitions + +The start-of-frame and end-of-frame bits were accidentally swapped. +In the current code it does not make any difference, since they are +always used together. + +Signed-off-by: Felix Fietkau <nbd@openwrt.org> +--- + +--- a/drivers/net/ethernet/broadcom/bgmac.h ++++ b/drivers/net/ethernet/broadcom/bgmac.h +@@ -345,8 +345,8 @@ + + #define BGMAC_DESC_CTL0_EOT 0x10000000 /* End of ring */ + #define BGMAC_DESC_CTL0_IOC 0x20000000 /* IRQ on complete */ +-#define BGMAC_DESC_CTL0_SOF 0x40000000 /* Start of frame */ +-#define BGMAC_DESC_CTL0_EOF 0x80000000 /* End of frame */ ++#define BGMAC_DESC_CTL0_EOF 0x40000000 /* End of frame */ ++#define BGMAC_DESC_CTL0_SOF 0x80000000 /* Start of frame */ + #define BGMAC_DESC_CTL1_LEN 0x00001FFF + + #define BGMAC_PHY_NOREGS 0x1E |