Skip to content

alx: mostly compile fixes #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

alx: mostly compile fixes #2

wants to merge 3 commits into from

Conversation

hauke
Copy link

@hauke hauke commented Jun 10, 2013

The first two patches are fixing problems when compiling alx against
kernel 3.10-rc4. This was only compile tested in backports and not run
time tested.

hauke added 3 commits June 9, 2013 13:20
@hauke
alx: add additional parameter to __vlan_hwaccel_put_tag()
4e880d3 
__vlan_hwaccel_put_tag() needs an additional parameter, this was added
in the following patch in mainline:

commit 86a9bad3ab6b6f858fd4443b48738cabbb6d094c
Author: Patrick McHardy <kaber@trash.net>
Date:   Fri Apr 19 02:04:30 2013 +0000

    net: vlan: add protocol argument to packet tagging functions

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
@hauke
alx: rename NETIF_F_HW_VLAN_* feature flags to NETIF_F_HW_VLAN_CTAG_*
b355292 
This was already done in mainline kernel in commit:
commit f646968f8f7c624587de729115d802372b9063dd
Author: Patrick McHardy <kaber@trash.net>
Date:   Fri Apr 19 02:04:27 2013 +0000

    net: vlan: rename NETIF_F_HW_VLAN_* feature flags to NETIF_F_HW_VLAN_CTAG_*

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
@hauke
alx: use module_pci_driver() to register driver
d5c8955 
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
@erikarn
Copy link
Owner

erikarn commented Jun 10, 2013

Sorry, please send pull requests to the QCA branch for now. Thats the
authoritative copy.

github.com/qca

adrian

On 10 June 2013 01:31, Hauke Mehrtens notifications@github.com wrote:

The first two patches are fixing problems when compiling alx against
kernel 3.10-rc4. This was only compile tested in backports and not run
time tested.

You can merge this Pull Request by running

git pull https://github.com/hauke/alx kernel-3.10-fixes

Or view, comment on, or merge it at:

#2

Commit Summary

alx: add additional parameter to vlan_hwaccel_put_tag()
alx: rename NETIF_F_HW_VLAN* feature flags to NETIF_F_HW_VLAN_CTAG*
alx: use module_pci_driver() to register driver

File Changes

M src/alx_main.c (30)

Patch Links:

https://github.com/erikarn/alx/pull/2.patch
https://github.com/erikarn/alx/pull/2.diff

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@hauke @erikarn