projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'timecounter-next'
[cascardo/linux.git]
/
drivers
/
net
/
ethernet
/
broadcom
/
bnx2x
/
bnx2x_main.c
diff --git
a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
index
691f0bf
..
0758c8b
100644
(file)
--- a/
drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
+++ b/
drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
@@
-12553,9
+12553,11
@@
static int bnx2x_get_phys_port_id(struct net_device *netdev,
return 0;
}
return 0;
}
-static bool bnx2x_gso_check(struct sk_buff *skb, struct net_device *dev)
+static netdev_features_t bnx2x_features_check(struct sk_buff *skb,
+ struct net_device *dev,
+ netdev_features_t features)
{
{
- return vxlan_
gso_check(skb
);
+ return vxlan_
features_check(skb, features
);
}
static const struct net_device_ops bnx2x_netdev_ops = {
}
static const struct net_device_ops bnx2x_netdev_ops = {
@@
-12589,7
+12591,7
@@
static const struct net_device_ops bnx2x_netdev_ops = {
#endif
.ndo_get_phys_port_id = bnx2x_get_phys_port_id,
.ndo_set_vf_link_state = bnx2x_set_vf_link_state,
#endif
.ndo_get_phys_port_id = bnx2x_get_phys_port_id,
.ndo_set_vf_link_state = bnx2x_set_vf_link_state,
- .ndo_
gso_check = bnx2x_gso
_check,
+ .ndo_
features_check = bnx2x_features
_check,
};
static int bnx2x_set_coherency_mask(struct bnx2x *bp)
};
static int bnx2x_set_coherency_mask(struct bnx2x *bp)
@@
-13256,7
+13258,7
@@
static int bnx2x_ptp_adjfreq(struct ptp_clock_info *ptp, s32 ppb)
return -EFAULT;
}
return -EFAULT;
}
- DP(BNX2X_MSG_PTP, "Config
ru
ed val = %d, period = %d\n", best_val,
+ DP(BNX2X_MSG_PTP, "Config
ur
ed val = %d, period = %d\n", best_val,
best_period);
return 0;
best_period);
return 0;
@@
-13265,14
+13267,10
@@
static int bnx2x_ptp_adjfreq(struct ptp_clock_info *ptp, s32 ppb)
static int bnx2x_ptp_adjtime(struct ptp_clock_info *ptp, s64 delta)
{
struct bnx2x *bp = container_of(ptp, struct bnx2x, ptp_clock_info);
static int bnx2x_ptp_adjtime(struct ptp_clock_info *ptp, s64 delta)
{
struct bnx2x *bp = container_of(ptp, struct bnx2x, ptp_clock_info);
- u64 now;
DP(BNX2X_MSG_PTP, "PTP adjtime called, delta = %llx\n", delta);
DP(BNX2X_MSG_PTP, "PTP adjtime called, delta = %llx\n", delta);
- now = timecounter_read(&bp->timecounter);
- now += delta;
- /* Re-init the timecounter */
- timecounter_init(&bp->timecounter, &bp->cyclecounter, now);
+ timecounter_adjtime(&bp->timecounter, delta);
return 0;
}
return 0;
}
@@
-14612,7
+14610,7
@@
static void bnx2x_init_cyclecounter(struct bnx2x *bp)
{
memset(&bp->cyclecounter, 0, sizeof(bp->cyclecounter));
bp->cyclecounter.read = bnx2x_cyclecounter_read;
{
memset(&bp->cyclecounter, 0, sizeof(bp->cyclecounter));
bp->cyclecounter.read = bnx2x_cyclecounter_read;
- bp->cyclecounter.mask = C
LOCKSOURCE
_MASK(64);
+ bp->cyclecounter.mask = C
YCLECOUNTER
_MASK(64);
bp->cyclecounter.shift = 1;
bp->cyclecounter.mult = 1;
}
bp->cyclecounter.shift = 1;
bp->cyclecounter.mult = 1;
}
@@
-14784,7
+14782,7
@@
static int bnx2x_hwtstamp_ioctl(struct bnx2x *bp, struct ifreq *ifr)
-EFAULT : 0;
}
-EFAULT : 0;
}
-/* Config
ru
es HW for PTP */
+/* Config
ur
es HW for PTP */
static int bnx2x_configure_ptp(struct bnx2x *bp)
{
int rc, port = BP_PORT(bp);
static int bnx2x_configure_ptp(struct bnx2x *bp)
{
int rc, port = BP_PORT(bp);