diff options
| author |   José Pekkarinen <jose.pekkarinen@nokia.com> | 2016-04-11 10:41:07 +0300 |
|---|---|---|
| committer | José Pekkarinen <jose.pekkarinen@nokia.com> | 2016-04-13 08:17:18 +0300 |
| commit | e09b41010ba33a20a87472ee821fa407a5b8da36 (patch) | |
| tree | d10dc367189862e7ca5c592f033dc3726e1df4e3 /kernel/drivers/staging/netlogic/xlr_net.h | |
| parent | f93b97fd65072de626c074dbe099a1fff05ce060 (diff) | |
These changes are the raw update to linux-4.4.6-rt14. Kernel sources
are taken from kernel.org, and rt patch from the rt wiki download page.
During the rebasing, the following patch collided:
Force tick interrupt and get rid of softirq magic(I70131fb85).
Collisions have been removed because its logic was found on the
source already.
Change-Id: I7f57a4081d9deaa0d9ccfc41a6c8daccdee3b769
Signed-off-by: José Pekkarinen <jose.pekkarinen@nokia.com>
Diffstat (limited to 'kernel/drivers/staging/netlogic/xlr_net.h')
| -rw-r--r-- | kernel/drivers/staging/netlogic/xlr_net.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/kernel/drivers/staging/netlogic/xlr_net.h b/kernel/drivers/staging/netlogic/xlr_net.h index 13e03f0a0..7ae8874da 100644 --- a/kernel/drivers/staging/netlogic/xlr_net.h +++ b/kernel/drivers/staging/netlogic/xlr_net.h @@ -999,7 +999,8 @@ #define MAC_CRC_LEN 4 #define MAX_NUM_MSGRNG_STN_CC 128 #define MAX_MSG_SND_ATTEMPTS 100 /* 13 stns x 4 entry msg/stn + - headroom */ + * headroom + */ #define MAC_FRIN_TO_BE_SENT_THRESHOLD 16 @@ -1102,4 +1103,4 @@ struct xlr_net_priv { u64 *class_3_spill; }; -extern void xlr_set_gmac_speed(struct xlr_net_priv *priv); +void xlr_set_gmac_speed(struct xlr_net_priv *priv); |