linux-toradex.git/drivers/net/ethernet/xscale, branch v4.1.10

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2015-03-04T02:16:48+00:00

Conflicts:
	drivers/net/ethernet/rocker/rocker.c

The rocker commit was two overlapping changes, one to rename
the ->vport member to ->pport, and another making the bitmask
expression use '1ULL' instead of plain '1'.

Signed-off-by: David S. Miller

ethernet: Use eth__addr instead of memset

2015-03-03T22:01:36+00:00

Use the built-in function instead of memset.

Signed-off-by: Joe Perches 
Acked-by: Jeff Kirsher 
Signed-off-by: David S. Miller

ethernet/ixp4xx: prevent allmulti from clobbering promisc

2015-02-20T20:49:07+00:00

If both promisc and allmulti are set, promisc should trump allmulti and
disable the MAC filter; otherwise, the interface is not really promisc.

Previously, this code checked IFF_ALLMULTI prior to and without regard for
IFF_PROMISC; if both were set, only multicast and direct unicast traffic
would make it through the filter.

Signed-off-by: Derrick Pallas 
Signed-off-by: David S. Miller

net: ptp: move PTP classifier in its own file

2014-04-01T20:43:18+00:00

This commit fixes a build error reported by Fengguang, that is
triggered when CONFIG_NETWORK_PHY_TIMESTAMPING is not set:

  ERROR: "ptp_classify_raw" [drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe.ko] undefined!

The fix is to introduce its own file for the PTP BPF classifier,
so that PTP_1588_CLOCK and/or NETWORK_PHY_TIMESTAMPING can select
it independently from each other. IXP4xx driver on ARM needs to
select it as well since it does not seem to select PTP_1588_CLOCK
or similar that would pull it in automatically.

This also allows for hiding all of the internals of the BPF PTP
program inside that file, and only exporting relevant API bits
to drivers.

This patch also adds a kdoc documentation of ptp_classify_raw()
API to make it clear that it can return PTP_CLASS_* defines. Also,
the BPF program has been translated into bpf_asm code, so that it
can be more easily read and altered (extensively documented in [1]).

In the kernel tree under tools/net/ we have bpf_asm and bpf_dbg
tools, so the commented program can simply be translated via
`./bpf_asm -c prog` where prog is a file that contains the
commented code. This makes it easily readable/verifiable and when
there's a need to change something, jump offsets etc do not need
to be replaced manually which can be very error prone. Instead,
a newly translated version via bpf_asm can simply replace the old
code. I have checked opcode diffs before/after and it's the very
same filter.

  [1] Documentation/networking/filter.txt

Fixes: 164d8c666521 ("net: ptp: do not reimplement PTP/BPF classifier")
Reported-by: Fengguang Wu 
Signed-off-by: Daniel Borkmann 
Signed-off-by: Alexei Starovoitov 
Cc: Richard Cochran 
Cc: Jiri Benc 
Acked-by: Richard Cochran 
Signed-off-by: David S. Miller

net: ptp: do not reimplement PTP/BPF classifier

2014-03-31T04:45:09+00:00

There are currently pch_gbe, cpts, and ixp4xx_eth drivers that open-code
and reimplement a BPF classifier for the PTP protocol. Since all of them
effectively do the very same thing and load the very same PTP/BPF filter,
we can just consolidate that code by introducing ptp_classify_raw() in
the time-stamping core framework which can be used in drivers.

As drivers get initialized after bootstrapping the core networking
subsystem, they can make use of ptp_insns wrapped through
ptp_classify_raw(), which allows to simplify and remove PTP classifier
setup code in drivers.

Joint work with Alexei Starovoitov.

Signed-off-by: Daniel Borkmann 
Signed-off-by: Alexei Starovoitov 
Cc: Richard Cochran 
Cc: Jiri Benc 
Signed-off-by: David S. Miller

ixp4xx_eth: Implement the SIOCGHWTSTAMP ioctl

2013-11-21T17:17:48+00:00

This is untested.

Signed-off-by: Ben Hutchings

ixp4xx_eth: Validate hwtstamp_config completely before applying it

2013-11-14T21:22:10+00:00

hwtstamp_ioctl() should validate all fields of hwtstamp_config
before making any changes.  Currently it sets the TX configuration
before validating the rx_filter field.

Untested as I don't have a cross-compiler to hand.

Signed-off-by: Ben Hutchings 
Signed-off-by: David S. Miller

net: ixp4xx_eth: use dev_get_platdata()

2013-08-30T21:43:39+00:00

Use the wrapper function for retrieving the platform data instead of
accessing dev->platform_data directly. This is a cosmetic change
to make the code simpler and enhance the readability.

Signed-off-by: Jingoo Han 
Signed-off-by: David S. Miller

net: ethernet: remove unnecessary platform_set_drvdata()

2013-05-28T05:34:51+00:00

The driver core clears the driver data to NULL after device_release
or on probe failure, since commit 0998d0631001288a5974afc0b2a5f568bcdecb4d
(device-core: Ensure drvdata = NULL when no driver is bound).
Thus, it is not needed to manually clear the device driver data to NULL.

Signed-off-by: Jingoo Han 
Acked-by: Nicolas Ferre 
Acked-by: Rob Herring 
Acked-by: Roland Stigge 
Acked-by: Mugunthan V N 
Reviewed-by: H Hartley Sweeten 
Tested-by: Roland Stigge 
Signed-off-by: David S. Miller

net: phy: remove flags argument from phy_{attach, connect, connect_direct}

2013-01-14T20:11:50+00:00

The flags argument of the phy_{attach,connect,connect_direct} functions
is then used to assign a struct phy_device dev_flags with its value.
All callers but the tg3 driver pass the flag 0, which results in the
underlying PHY drivers in drivers/net/phy/ not being able to actually
use any of the flags they would set in dev_flags. This patch gets rid of
the flags argument, and passes phydev->dev_flags to the internal PHY
library call phy_attach_direct() such that drivers which actually modify
a phy device dev_flags get the value preserved for use by the underlying
phy driver.

Acked-by: Kosta Zertsekel 
Signed-off-by: Florian Fainelli 
Signed-off-by: David S. Miller