Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
These changes are the raw update to linux-4.4.6-rt14. Kernel sources
[kvmfornfv.git]
/
kernel
/
drivers
/
media
/
dvb-core
/
dvb_net.c
diff --git
a/kernel/drivers/media/dvb-core/dvb_net.c
b/kernel/drivers/media/dvb-core/dvb_net.c
index
a694fb1
..
ce4332e
100644
(file)
--- a/
kernel/drivers/media/dvb-core/dvb_net.c
+++ b/
kernel/drivers/media/dvb-core/dvb_net.c
@@
-709,7
+709,7
@@
static void dvb_net_ule( struct net_device *dev, const u8 *buf, size_t buf_len )
if (!priv->ule_dbit) {
/* dest_addr buffer is only valid if priv->ule_dbit == 0 */
memcpy(ethh->h_dest, dest_addr, ETH_ALEN);
if (!priv->ule_dbit) {
/* dest_addr buffer is only valid if priv->ule_dbit == 0 */
memcpy(ethh->h_dest, dest_addr, ETH_ALEN);
-
memset(ethh->h_source, 0, ETH_ALEN
);
+
eth_zero_addr(ethh->h_source
);
}
else /* zeroize source and dest */
memset( ethh, 0, ETH_ALEN*2 );
}
else /* zeroize source and dest */
memset( ethh, 0, ETH_ALEN*2 );
@@
-761,7
+761,7
@@
static void dvb_net_ule( struct net_device *dev, const u8 *buf, size_t buf_len )
static int dvb_net_ts_callback(const u8 *buffer1, size_t buffer1_len,
const u8 *buffer2, size_t buffer2_len,
static int dvb_net_ts_callback(const u8 *buffer1, size_t buffer1_len,
const u8 *buffer2, size_t buffer2_len,
- struct dmx_ts_feed *feed
, enum dmx_success success
)
+ struct dmx_ts_feed *feed)
{
struct net_device *dev = feed->priv;
{
struct net_device *dev = feed->priv;
@@
-870,8
+870,7
@@
static void dvb_net_sec(struct net_device *dev,
static int dvb_net_sec_callback(const u8 *buffer1, size_t buffer1_len,
const u8 *buffer2, size_t buffer2_len,
static int dvb_net_sec_callback(const u8 *buffer1, size_t buffer1_len,
const u8 *buffer2, size_t buffer2_len,
- struct dmx_section_filter *filter,
- enum dmx_success success)
+ struct dmx_section_filter *filter)
{
struct net_device *dev = filter->priv;
{
struct net_device *dev = filter->priv;