From: David S. Miller Date: Mon, 28 Aug 2017 23:49:49 +0000 (-0700) Subject: Merge branch 'NCSI-vlan-filtering' X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=33b86ba0572b539239cde8d6b3e7835bb6fc3516;p=openwrt%2Fstaging%2Fblogic.git Merge branch 'NCSI-vlan-filtering' Samuel Mendoza-Jonas says: ==================== NCSI VLAN Filtering Support This series (mainly patch 2) adds VLAN filtering to the NCSI implementation. A fair amount of code already exists in the NCSI stack for VLAN filtering but none of it is actually hooked up. This goes the final mile and fixes a few bugs in the existing code found along the way (patch 1). Patch 3 adds the appropriate flag and callbacks to the ftgmac100 driver to enable filtering as it's a large consumer of NCSI (and what I've been testing on). v3: - Add comment describing change to ncsi_find_filter() - Catch NULL in clear_one_vid() from ncsi_get_filter() - Simplify state changes when kicking updated channel ==================== Signed-off-by: David S. Miller --- 33b86ba0572b539239cde8d6b3e7835bb6fc3516