|
 |
742bd8 |
diff -up linux-3.10.0-327.sdl7.x86_64/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c.otherfixes linux-3.10.0-327.sdl7.x86_64/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
|
|
|
742bd8 |
--- linux-3.10.0-327.sdl7.x86_64/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c.otherfixes 2015-10-29 16:56:51.000000000 -0400
|
|
|
742bd8 |
+++ linux-3.10.0-327.sdl7.x86_64/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c 2015-11-22 00:24:06.753025997 -0500
|
|
|
742bd8 |
@@ -13314,7 +13314,7 @@ static int bnx2x_ptp_adjtime(struct ptp_
|
|
|
742bd8 |
return 0;
|
|
|
742bd8 |
}
|
|
|
742bd8 |
|
|
|
742bd8 |
-static int bnx2x_ptp_gettime(struct ptp_clock_info *ptp, struct timespec *ts)
|
|
|
742bd8 |
+static int bnx2x_ptp_gettime(struct ptp_clock_info *ptp, struct timespec64 *ts)
|
|
|
742bd8 |
{
|
|
|
742bd8 |
struct bnx2x *bp = container_of(ptp, struct bnx2x, ptp_clock_info);
|
|
|
742bd8 |
u64 ns;
|
|
|
742bd8 |
@@ -13329,7 +13329,7 @@ static int bnx2x_ptp_gettime(struct ptp_
|
|
|
742bd8 |
}
|
|
|
742bd8 |
|
|
|
742bd8 |
static int bnx2x_ptp_settime(struct ptp_clock_info *ptp,
|
|
|
742bd8 |
- const struct timespec *ts)
|
|
|
742bd8 |
+ const struct timespec64 *ts)
|
|
|
742bd8 |
{
|
|
|
742bd8 |
struct bnx2x *bp = container_of(ptp, struct bnx2x, ptp_clock_info);
|
|
|
742bd8 |
u64 ns;
|
|
|
742bd8 |
diff -up linux-3.10.0-327.sdl7.x86_64/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c.otherfixes linux-3.10.0-327.sdl7.x86_64/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c
|
|
|
742bd8 |
--- linux-3.10.0-327.sdl7.x86_64/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c.otherfixes 2015-10-29 16:56:51.000000000 -0400
|
|
|
742bd8 |
+++ linux-3.10.0-327.sdl7.x86_64/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c 2015-11-22 00:35:15.639038546 -0500
|
|
|
742bd8 |
@@ -279,7 +279,7 @@ static int ixgbe_ptp_adjtime(struct ptp_
|
|
|
742bd8 |
* read the timecounter and return the correct value on ns,
|
|
|
742bd8 |
* after converting it into a struct timespec.
|
|
|
742bd8 |
*/
|
|
|
742bd8 |
-static int ixgbe_ptp_gettime(struct ptp_clock_info *ptp, struct timespec *ts)
|
|
|
742bd8 |
+static int ixgbe_ptp_gettime(struct ptp_clock_info *ptp, struct timespec64 *ts)
|
|
|
742bd8 |
{
|
|
|
742bd8 |
struct ixgbe_adapter *adapter =
|
|
|
742bd8 |
container_of(ptp, struct ixgbe_adapter, ptp_caps);
|
|
|
742bd8 |
@@ -304,7 +304,7 @@ static int ixgbe_ptp_gettime(struct ptp_
|
|
|
742bd8 |
* wall timer value.
|
|
|
742bd8 |
*/
|
|
|
742bd8 |
static int ixgbe_ptp_settime(struct ptp_clock_info *ptp,
|
|
|
742bd8 |
- const struct timespec *ts)
|
|
|
742bd8 |
+ const struct timespec64 *ts)
|
|
|
742bd8 |
{
|
|
|
742bd8 |
struct ixgbe_adapter *adapter =
|
|
|
742bd8 |
container_of(ptp, struct ixgbe_adapter, ptp_caps);
|
|
|
742bd8 |
@@ -404,7 +404,7 @@ void ixgbe_ptp_overflow_check(struct ixg
|
|
|
742bd8 |
{
|
|
|
742bd8 |
bool timeout = time_is_before_jiffies(adapter->last_overflow_check +
|
|
|
742bd8 |
IXGBE_OVERFLOW_PERIOD);
|
|
|
742bd8 |
- struct timespec ts;
|
|
|
742bd8 |
+ struct timespec64 ts;
|
|
|
742bd8 |
|
|
|
742bd8 |
if (timeout) {
|
|
|
742bd8 |
ixgbe_ptp_gettime(&adapter->ptp_caps, &ts);
|