| 32efe08d77f5902ce7315fc9003c010ffffb8268 |
|
19-Feb-2012 |
David S. Miller <davem@davemloft.net> |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.c
Small minor conflict in bnx2x, wherein one commit changed how
statistics were stored in software, and another commit
fixed endianness bugs wrt. reading the values provided by
the chip in memory.
Signed-off-by: David S. Miller <davem@davemloft.net>
|
| cf3f047b9af49d4ee8abfa31b0ef0e99cbcaf17d |
|
15-Feb-2012 |
Giuseppe CAVALLARO <peppe.cavallaro@st.com> |
stmmac: move hw init in the probe (v2)
This patch moves the MAC HW initialization and
the HW feature verification from the open to the probe
function as D. Miller suggested.
So the patch actually reorganizes and tidies-up some parts of
the driver and indeed fixes some problem when tune its HW features.
These can be overwritten by looking at the HW cap register at
run-time and that generated problems.
Signed-off-by: Giuseppe Cavallaro <peppe.cavallaro@st.com>
Reviewed-by: Francesco Virlinzi <francesco.virlinzi@st.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
/drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c
|
| 0f09a343dabeadc4dcde4714317e25de2e93fd13 |
|
12-Feb-2012 |
Masanari Iida <standby24x7@gmail.com> |
stmicro: Fix typo in stmmac_pci.c and stmmac_platform.c
Correct spelling "drivr" to "driver" in
drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c
drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
Signed-off-by: Masanari Iida <standby24x7@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
/drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c
|
| 8c1a7f5283e72306d1d23524f051501ffa1baf57 |
|
08-Feb-2012 |
Masanari Iida <standby24x7@gmail.com> |
stmmac: Fix typo in stmmac_pci.c
Correct spelling "regiser" to "register" in
drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c
Signed-off-by: Masanari Iida <standby24x7@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
/drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c
|
| 5437f4b2576f1763a27bc4c0e7f7c280220ba1aa |
|
24-Jan-2012 |
Alessandro Rubini <rubini@gnudd.com> |
stmmac: added PCI identifiers
STM has a device ID within its own VENDOR space, and it is being
used in the STA2X11 I/O Hub.
Signed-off-by: Alessandro Rubini <rubini@gnudd.com>
Acked-by: Giancarlo Asnaghi <giancarlo.asnaghi@st.com>
Acked-by: Giuseppe Cavallaro <peppe.cavallaro@st.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
/drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c
|
| bfab27a146ed4d722c6d399f844f955f29cd2b81 |
|
21-Dec-2011 |
Giuseppe CAVALLARO <peppe.cavallaro@st.com> |
stmmac: add the experimental PCI support
This patch adds the PCI support (as EXPERIMENTAL)
this has been also tested on XLINX XC2V3000 FF1152AMT0221
D1215994A VIRTEX FPGA board.
To support the PCI bus the main part has been reworked
and both the platform and the PCI specific parts have
been moved into different files.
Signed-off-by: Rayagond Kokatanur <rayagond@vayavyalabs.com>
Signed-off-by: Giuseppe Cavallaro <peppe.cavallaro@st.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
/drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c
|