Skip to content

Commit

Permalink
Merge branch 'rocker-worlds'
Browse files Browse the repository at this point in the history
Jiri Pirko says:

====================
rocker: do world split

This patchset allows new rocker worlds to be easily added in future.
Two new worlds are now under development: P4 and eBPF.

The main part of the patchset is the OF-DPA carve-out. It resuts in OF-DPA
specific file. Clean cut.

Note this patchset is based on my original attempt in October 2015.
I had to rebase, included all suggestions and did lot of small changes.
Main change to go with all-port-one-world approach. Port world is set according
to what is setup in HW. Not possible to change worlds from driver.

v1->v2:
  patch 12/13:
  - split port_init into pre-init and init
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
David S. Miller committed Feb 18, 2016
2 parents b1e0b12 + fccd84d commit 2bc6b4f
Show file tree
Hide file tree
Showing 8 changed files with 6,716 additions and 5,946 deletions.
1 change: 1 addition & 0 deletions drivers/net/ethernet/rocker/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,4 @@
#

obj-$(CONFIG_ROCKER) += rocker.o
rocker-y := rocker_main.o rocker_tlv.o rocker_ofdpa.o
Loading

0 comments on commit 2bc6b4f

Please sign in to comment.